This repository has been archived by the owner on Oct 13, 2023. It is now read-only.
builder: fix copy —from conflict with force pull #86
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tiborvass
changed the title
6 tasks
|
It's WIP until moby/moby#33735 is merged |
dnephin
reviewed
Jun 20, 2017
| if !opts.ForcePull { | ||
| image, _ := daemon.GetImage(refOrID) | ||
| id, _ := daemon.GetImageID(refOrID) | ||
| refIsID := id.String() == refOrID // detect if ref is an ID to skip pulling |
There was a problem hiding this comment.
Let's not merge this just yet. This really doesn't seem like the right fix to me.
Either we should use the official "is ref or ID" logic from GetImageID() or we should have the caller pass in opts.ForcePull = false for this case (when it knows it has an ID).
|
Closing for now |
|
@tiborvass Can you reopen with updated fix |
|
ping @tiborvass @tonistiigi what's the status on this one? |
Merged
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> (cherry picked from commit e430b58811813084df2b9f8b1a9e929114b2187a) Signed-off-by: Tibor Vass <tibor@docker.com>
tiborvass
force-pushed
the
rc5-builder-fix
branch
from
86ffab9
to
51acf33
Compare
tiborvass
changed the title
|
Ping @tonistiigi sorry for the delay. |
|
Compile is failing on Windows; |
|
LGTM |
1 similar comment
|
LGTM |
Merged
docker-jenkins
pushed a commit
that referenced
this pull request
Feb 15, 2018
Update readme to supported packages Upstream-commit: a54da87 Component: packaging
docker-jenkins
pushed a commit
that referenced
this pull request
Oct 13, 2018
[18.09] backport Fix mount propagation for btrfs Upstream-commit: 4d0b8cc2d701e2a09b8e1f889b98c08d225d8145 Component: engine
silvin-lubecki
pushed a commit
to silvin-lubecki/docker-ce
that referenced
this pull request
Jan 30, 2020
Update readme to supported packages
silvin-lubecki
pushed a commit
to silvin-lubecki/docker-ce
that referenced
this pull request
Feb 3, 2020
builder: fix copy —from conflict with force pull
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Tonis Tiigi tonistiigi@gmail.com
(cherry picked from commit e430b58811813084df2b9f8b1a9e929114b2187a)
Signed-off-by: Tibor Vass tibor@docker.com