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

[17.06] backport fix "Stop trying to load images on an incompatible OS"#108

Merged
andrewhsu merged 3 commits intodocker-archive:17.06from
andrewhsu:fix-load-image
Jul 13, 2017
Merged

[17.06] backport fix "Stop trying to load images on an incompatible OS"#108
andrewhsu merged 3 commits intodocker-archive:17.06from
andrewhsu:fix-load-image

Conversation

@andrewhsu
Copy link
Contributor

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.

Signed-off-by: John Stephens <johnstep@docker.com>
(cherry picked from commit b9255e4)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
@andrewhsu
Copy link
Contributor Author

cc @johnstep

@andrewhsu andrewhsu modified the milestone: 17.06.1 Jul 12, 2017
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>
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Copy link
Contributor

@johnstep johnstep 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 06f434c into docker-archive:17.06 Jul 13, 2017
@andrewhsu andrewhsu deleted the fix-load-image branch July 13, 2017 19:04
docker-jenkins pushed a commit that referenced this pull request May 18, 2018
Remove Debian Wheezy, EOL 31-05-2018
Upstream-commit: 98df931
Component: packaging
docker-jenkins pushed a commit that referenced this pull request Nov 6, 2018
[18.09] builder: update copy to 0.1.9
Upstream-commit: 9512677feb8480bf13844cc4c225310bbdd2cf04
Component: engine
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Feb 3, 2020
[17.06] backport fix "Stop trying to load images on an incompatible OS"
akrasnov-drv pushed a commit to drivenets/docker-ce that referenced this pull request Apr 23, 2023
Remove Debian Wheezy, EOL 31-05-2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

X Tutup