New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[17.06] build: fix add from remote url #89

Merged
merged 1 commit into from Jul 12, 2017

Conversation

Projects
None yet
4 participants
@tonistiigi
Member

tonistiigi commented Jul 3, 2017

cherry-pick fix:

workaround for 17.06 to avoid bigger refactor because of merge conflicts

@dnephin @andrewhsu

build: fix add from remote url
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 2981667)
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
@thaJeztah

LGTM

@andrewhsu

This comment has been minimized.

Show comment
Hide comment
@andrewhsu

andrewhsu Jul 3, 2017

Collaborator

Just one test failed on windows, but seems unrelated:

02:32:57.858 FAIL: check_test.go:97: DockerSuite.TearDownTest
02:32:57.858 
02:32:57.858 check_test.go:98:
02:32:57.858     testEnv.Clean(c, dockerBinary)
02:32:57.858 environment/clean.go:63:
02:32:57.858     t.Fatalf("error removing containers %v : %v (%s)", containers, result.Error, result.Combined())
02:32:57.859 ... Error: error removing containers [e6b50cb78f72] : exit status 1 (Error response from daemon: Could not kill running container e6b50cb78f72042e8498fc0e54bbc15e3c7da5d28be9906aa95c979229c2703d, cannot remove - Cannot kill container e6b50cb78f72042e8498fc0e54bbc15e3c7da5d28be9906aa95c979229c2703d: invalid container: e6b50cb78f72042e8498fc0e54bbc15e3c7da5d28be9906aa95c979229c2703d
02:32:57.860 )
02:32:57.860 
02:32:57.860 
02:32:57.860 ----------------------------------------------------------------------
02:32:57.860 PANIC: docker_api_containers_test.go:905: DockerSuite.TestContainerAPIStart
02:32:57.860 
02:32:57.860 ... Panic: Fixture has panicked (see related PANIC)
Collaborator

andrewhsu commented Jul 3, 2017

Just one test failed on windows, but seems unrelated:

02:32:57.858 FAIL: check_test.go:97: DockerSuite.TearDownTest
02:32:57.858 
02:32:57.858 check_test.go:98:
02:32:57.858     testEnv.Clean(c, dockerBinary)
02:32:57.858 environment/clean.go:63:
02:32:57.858     t.Fatalf("error removing containers %v : %v (%s)", containers, result.Error, result.Combined())
02:32:57.859 ... Error: error removing containers [e6b50cb78f72] : exit status 1 (Error response from daemon: Could not kill running container e6b50cb78f72042e8498fc0e54bbc15e3c7da5d28be9906aa95c979229c2703d, cannot remove - Cannot kill container e6b50cb78f72042e8498fc0e54bbc15e3c7da5d28be9906aa95c979229c2703d: invalid container: e6b50cb78f72042e8498fc0e54bbc15e3c7da5d28be9906aa95c979229c2703d
02:32:57.860 )
02:32:57.860 
02:32:57.860 
02:32:57.860 ----------------------------------------------------------------------
02:32:57.860 PANIC: docker_api_containers_test.go:905: DockerSuite.TestContainerAPIStart
02:32:57.860 
02:32:57.860 ... Panic: Fixture has panicked (see related PANIC)
@thaJeztah

This comment has been minimized.

Show comment
Hide comment
@thaJeztah

thaJeztah Jul 4, 2017

Member

ping @tiborvass PTAL

Member

thaJeztah commented Jul 4, 2017

ping @tiborvass PTAL

@andrewhsu andrewhsu changed the title from cherry-pick: build: fix add from remote url to [17.06] build: fix add from remote url Jul 4, 2017

@thaJeztah

This comment has been minimized.

Show comment
Hide comment
@thaJeztah

thaJeztah Jul 12, 2017

Member

ping @dnephin PTAL

Member

thaJeztah commented Jul 12, 2017

ping @dnephin PTAL

@andrewhsu

This comment has been minimized.

Show comment
Hide comment
@andrewhsu

andrewhsu Jul 12, 2017

Collaborator

@tonistiigi if you rebase with 17.06 branch I believe the DockerSuite.TearDownTest will pass

Collaborator

andrewhsu commented Jul 12, 2017

@tonistiigi if you rebase with 17.06 branch I believe the DockerSuite.TearDownTest will pass

@andrewhsu andrewhsu modified the milestone: 17.06.1 Jul 12, 2017

@dnephin

LGTM

@andrewhsu andrewhsu merged commit 2e99eed into docker:17.06 Jul 12, 2017

2 of 3 checks passed

ce-tests-WoW-RS1 Jenkins build docker-ce-17.06-pr-WoW-RS1 117 has failed
Details
ce-tests Jenkins build docker-ce-17.06-pr 129 has succeeded
Details
dco-signed All commits are signed

@MikeVL MikeVL referenced this pull request Dec 21, 2017

Open

Upgrade docker package #723

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment