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

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

Merged
merged 1 commit into from
Jul 12, 2017
Merged

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

merged 1 commit into from
Jul 12, 2017

Conversation

tonistiigi
Copy link
Contributor

@tonistiigi tonistiigi commented Jul 3, 2017 •
edited by andrewhsu
Loading

cherry-pick fix:

workaround for 17.06 to avoid bigger refactor because of merge conflicts

@dnephin @andrewhsu

@tonistiigi
build: fix add from remote url
d0546cf 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 2981667)
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
thaJeztah
thaJeztah approved these changes Jul 3, 2017
View reviewed changes
Copy link
Member

@thaJeztah thaJeztah 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

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
Copy link
Member

ping @tiborvass PTAL

@andrewhsu andrewhsu changed the title cherry-pick: build: fix add from remote url [17.06] build: fix add from remote url Jul 4, 2017
@andrewhsu andrewhsu mentioned this pull request Jul 11, 2017
Open
@thaJeztah
Copy link
Member

ping @dnephin PTAL

@andrewhsu
Copy link
Contributor

@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
dnephin approved these changes Jul 12, 2017
View reviewed changes
Copy link
Contributor

@dnephin dnephin 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 andrewhsu merged commit 2e99eed into docker-archive:17.06 Jul 12, 2017
@MikeVL MikeVL mentioned this pull request Dec 21, 2017
Closed
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Feb 3, 2020
@andrewhsu
Merge pull request docker-archive#89 from tonistiigi/fix-add-remote
fcc3e3b 
[17.06] build: fix add from remote url
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@thaJeztah thaJeztah thaJeztah approved these changes

@dnephin dnephin dnephin approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
17.06.1
Development

Successfully merging this pull request may close these issues.
4 participants
@tonistiigi @andrewhsu @thaJeztah @dnephin