Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Conversation

@andrewhsu
Copy link
Contributor

@andrewhsu andrewhsu commented Aug 1, 2017

Re-vndr libnetwork to latest git commit moby/libnetwork@f0b9939 of bump_17.06.0 branch which brings in the following changes:

EDIT: the PR moby/libnetwork/pull/1875 was reverted with moby/libnetwork@f0b9939

$ cd components/engine
$ make BIND_DIR=. shell
$ vi vendor.conf # bump to git commit f0b9939
$ vndr github.com/docker/libnetwork

For reference, here is the stuff that changed on libnetwork: moby/libnetwork@20bf4e2...f0b9939

Signed-off-by: Andrew Hsu andrewhsu@docker.com

@andrewhsu andrewhsu requested a review from fcrisciani August 1, 2017 17:23
@andrewhsu andrewhsu added this to the 17.06.1 milestone Aug 1, 2017
Copy link

@fcrisciani fcrisciani left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@andrewhsu
Copy link
Contributor Author

Seeing this error on builds:

[DockerDaemonSuite] FAIL: docker_cli_network_unix_test.go:1677: DockerDaemonSuite.TestDaemonRestartRestoreBridgeNetwork
[DockerDaemonSuite] 
[DockerDaemonSuite] [d4c2f01bc0001] waiting for daemon to start
[DockerDaemonSuite] [d4c2f01bc0001] daemon started
[DockerDaemonSuite] 
[DockerDaemonSuite] [d4c2f01bc0001] waiting for daemon to start
[DockerDaemonSuite] [d4c2f01bc0001] daemon started
[DockerDaemonSuite] 
[DockerDaemonSuite] docker_cli_network_unix_test.go:1733:
[DockerDaemonSuite]     t.Fatal(err)
[DockerDaemonSuite] ... Error: exit status 125
[DockerDaemonSuite] 
[DockerDaemonSuite] [d4c2f01bc0001] exiting daemon

vndr github.com/docker/libnetwork

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
@andrewhsu
Copy link
Contributor Author

Just updated the PR to get new changes on the bump branch that reverts moby/libnetwork#1875

@andrewhsu
Copy link
Contributor Author

LGTM

we are all green

@andrewhsu andrewhsu merged commit 7ddc25c into docker-archive:17.06 Aug 2, 2017
@andrewhsu andrewhsu deleted the ln branch August 2, 2017 03:29
tophj-ibm pushed a commit to tophj-ibm/docker-ce that referenced this pull request Aug 29, 2017
…-fail

Fix check-git-diff in CI
Upstream-commit: 85453417090376b9fded34309715eca137980529
Component: cli
docker-jenkins pushed a commit that referenced this pull request Aug 23, 2018
[18.09] Remove overlay as the default storage driver
Upstream-commit: 54dc76c596e5f5fe8ee76e65a0ac601f8a1d8e8b
Component: packaging
docker-jenkins pushed a commit that referenced this pull request Feb 21, 2019
[18.09 backport] make test-integration: use correct dockerd binary
Upstream-commit: f935add7583e7741c43f110ba354957730b78d4c
Component: engine
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Feb 3, 2020
re-vndr libnetwork to latest on bump_17.06.0 branch
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants