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

builder: fix copy —from conflict with force pull #86

Merged
merged 1 commit into from Jul 25, 2017

Conversation

Projects
None yet
6 participants
@tiborvass
Contributor

tiborvass commented Jun 20, 2017

Signed-off-by: Tonis Tiigi tonistiigi@gmail.com
(cherry picked from commit e430b58811813084df2b9f8b1a9e929114b2187a)
Signed-off-by: Tibor Vass tibor@docker.com

@tiborvass tiborvass changed the title from builder: fix copy —from conflict with force pull to [WIP] builder: fix copy —from conflict with force pull Jun 20, 2017

@andrewhsu andrewhsu referenced this pull request Jun 20, 2017

Closed

17.06.0 RC5 tracker #37

6 of 6 tasks complete
@tiborvass

This comment has been minimized.

Show comment
Hide comment
@tiborvass

tiborvass Jun 20, 2017

Contributor

It's WIP until moby/moby#33735 is merged

Contributor

tiborvass commented Jun 20, 2017

It's WIP until moby/moby#33735 is merged

if !opts.ForcePull {
image, _ := daemon.GetImage(refOrID)
id, _ := daemon.GetImageID(refOrID)
refIsID := id.String() == refOrID // detect if ref is an ID to skip pulling

This comment has been minimized.

@dnephin

dnephin Jun 20, 2017

Contributor

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).

@dnephin

dnephin Jun 20, 2017

Contributor

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).

@tiborvass

This comment has been minimized.

Show comment
Hide comment
@tiborvass

tiborvass Jun 20, 2017

Contributor

Closing for now

Contributor

tiborvass commented Jun 20, 2017

Closing for now

@tiborvass tiborvass closed this Jun 20, 2017

@tonistiigi

This comment has been minimized.

Show comment
Hide comment
@tonistiigi

tonistiigi Jun 26, 2017

Member

@tiborvass Can you reopen with updated fix

Member

tonistiigi commented Jun 26, 2017

@tiborvass Can you reopen with updated fix

@tiborvass tiborvass reopened this Jun 27, 2017

@thaJeztah

This comment has been minimized.

Show comment
Hide comment
@thaJeztah

thaJeztah Jul 18, 2017

Member

ping @tiborvass @tonistiigi what's the status on this one?

Member

thaJeztah commented Jul 18, 2017

ping @tiborvass @tonistiigi what's the status on this one?

@thaJeztah thaJeztah referenced this pull request Jul 21, 2017

Merged

[17.07.x] Changelog #124

builder: fix copy —from conflict with force pull
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit e430b58811813084df2b9f8b1a9e929114b2187a)
Signed-off-by: Tibor Vass <tibor@docker.com>

@tiborvass tiborvass changed the title from [WIP] builder: fix copy —from conflict with force pull to builder: fix copy —from conflict with force pull Jul 22, 2017

@tiborvass

This comment has been minimized.

Show comment
Hide comment
@tiborvass

tiborvass Jul 22, 2017

Contributor

Ping @tonistiigi sorry for the delay.

Contributor

tiborvass commented Jul 22, 2017

Ping @tonistiigi sorry for the delay.

@thaJeztah

This comment has been minimized.

Show comment
Hide comment
@thaJeztah

thaJeztah Jul 22, 2017

Member

Compile is failing on Windows;

05:41:10 # github.com/docker/cli/vendor/github.com/docker/docker/pkg/system
05:41:10 ..\..\vendor\github.com\docker\docker\pkg\system\init.go:10: maxTime redeclared in this block
05:41:10 	previous declaration at ..\..\vendor\github.com\docker\docker\pkg\system\chtimes.go:11
05:41:10 ..\..\vendor\github.com\docker\docker\pkg\system\path_windows.go:13: DefaultPathEnv redeclared in this block
05:41:10 	previous declaration at ..\..\vendor\github.com\docker\docker\pkg\system\path.go:10
Member

thaJeztah commented Jul 22, 2017

Compile is failing on Windows;

05:41:10 # github.com/docker/cli/vendor/github.com/docker/docker/pkg/system
05:41:10 ..\..\vendor\github.com\docker\docker\pkg\system\init.go:10: maxTime redeclared in this block
05:41:10 	previous declaration at ..\..\vendor\github.com\docker\docker\pkg\system\chtimes.go:11
05:41:10 ..\..\vendor\github.com\docker\docker\pkg\system\path_windows.go:13: DefaultPathEnv redeclared in this block
05:41:10 	previous declaration at ..\..\vendor\github.com\docker\docker\pkg\system\path.go:10
@vieux

This comment has been minimized.

Show comment
Hide comment
@vieux

vieux Jul 25, 2017

Contributor

LGTM

Contributor

vieux commented Jul 25, 2017

LGTM

1 similar comment
@tonistiigi

This comment has been minimized.

Show comment
Hide comment
@tonistiigi

tonistiigi Jul 25, 2017

Member

LGTM

Member

tonistiigi commented Jul 25, 2017

LGTM

@vieux vieux merged commit b379923 into docker:17.06 Jul 25, 2017

3 checks passed

ce-tests Jenkins build docker-ce-pr 9 has succeeded
Details
ce-tests-WoW-RS1 Jenkins build docker-ce-pr-WoW-RS1 219 has succeeded
Details
dco-signed All commits are signed

@vieux vieux referenced this pull request Jul 25, 2017

Merged

[17.06] Changelog #129

@andrewhsu andrewhsu added this to the 17.06.1 milestone Jul 27, 2017

@MikeVL MikeVL referenced this pull request Dec 21, 2017

Open

Upgrade docker package #723

docker-jenkins pushed a commit that referenced this pull request Feb 15, 2018

Merge pull request #86 from eiais/newPackages
Update readme to supported packages
Upstream-commit: a54da87b1f51743d9b750a8f1d4997e332faa903
Component: packaging

docker-jenkins pushed a commit that referenced this pull request Oct 13, 2018

Merge pull request #86 from kolyshkin/18.09-backport-btrfs-prop
[18.09] backport Fix mount propagation for btrfs
Upstream-commit: 4d0b8cc2d701e2a09b8e1f889b98c08d225d8145
Component: engine
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment