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] backport fix "Stop trying to load images on an incompatible OS" #108

Merged
merged 3 commits into from Jul 13, 2017

Conversation

Projects
None yet
2 participants
@andrewhsu
Collaborator

andrewhsu commented Jul 11, 2017

Backport fix:

With cherry-pick of moby/moby@b9255e4:

$ git cherry-pick -s -x -Xsubtree=components/engine b9255e4

No need to cherry-pick into componetns/cli/vendor because file is not used by the client.

Stop trying to load images on an incompatible OS
Signed-off-by: John Stephens <johnstep@docker.com>
(cherry picked from commit b9255e4)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
@andrewhsu

This comment has been minimized.

Show comment
Hide comment
@andrewhsu

andrewhsu Jul 12, 2017

Collaborator
Collaborator

andrewhsu commented Jul 12, 2017

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

andrewhsu added some commits Jul 12, 2017

adjust cherry-pick moby/moby@b9255e4 to work without lcow
Because the LCOW support is not part of this codebase, removing the
lines that expect it to be there.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
import runtime so cherry-pick moby/moby@b9255e4 can work
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
@johnstep

LGTM

@andrewhsu andrewhsu merged commit 06f434c into docker:17.06 Jul 13, 2017

3 checks passed

ce-tests Jenkins build docker-ce-17.06-pr 179 has succeeded
Details
ce-tests-WoW-RS1 Jenkins build docker-ce-17.06-pr-WoW-RS1 173 has succeeded
Details
dco-signed All commits are signed

@andrewhsu andrewhsu deleted the andrewhsu:fix-load-image branch Jul 13, 2017

docker-jenkins pushed a commit that referenced this pull request May 18, 2018

Merge pull request #108 from seemethere/wheezy
Remove Debian Wheezy, EOL 31-05-2018
Upstream-commit: 98df9315ccf80b18546921968f3881080fa6ccf0
Component: packaging
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment