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.03.x] fix autoremove on older api #31692

Merged
merged 2 commits into from Mar 9, 2017

Conversation

Projects
None yet
5 participants
@thaJeztah
Member

thaJeztah commented Mar 9, 2017

Commit 87a5346 cherry-picked changes into the 17.03 branch to make the client skip auto-removing containers on API 1.25 and up.

Some changes got lost during that cherry-pick, resulting in 17.03 clients to not fall back to the old behavior when connecting to API version 1.24 or below.

This patch addresses this issue for the 17.03 branch by copying the HostConfig.AutoRemove property to a local variable before it is overridden in ContainerCreate().

This change is not needed on "master" (17.04-dev), which does not have this problem.

Thanks to @jlhawn for finding this bug.

I also added integration tests in a second commit (32dbb5c), so that we can merge those tests to master

thaJeztah added some commits Mar 9, 2017

[17.03.x] fix autoremove on pre 1.25 API
Commit 87a5346 cherry-picked
changes into the 17.03 branch to make the client
skip auto-removing containers on API 1.25 and up.

Some changes got lost during that cherry-pick,
resulting in 17.03 clients to not fall back to
the old behavior when connecting to API version
1.24 or below.

This patch addresses this issue for the 17.03
branch by copying the `HostConfig.AutoRemove` property
to a local variable before it is overridden
in `ContainerCreate()`.

This change is not needed on "master" (17.04-dev),
which does not have this problem.

Thanks to Josh Hawn for finding this bug.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Add integration tests for client- and daemon-side auto-remove
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@vdemeester

LGTM 🐸

@jlhawn

jlhawn approved these changes Mar 9, 2017

@vieux

This comment has been minimized.

Show comment
Hide comment
@vieux

vieux Mar 9, 2017

Collaborator

LGTM

Collaborator

vieux commented Mar 9, 2017

LGTM

@vieux vieux merged commit 502b068 into moby:17.03.x Mar 9, 2017

4 of 6 checks passed

powerpc Jenkins build is being scheduled
Details
z Jenkins build is being scheduled
Details
dco-signed All commits are signed
experimental Jenkins build Docker-PRs-experimental 31505 has succeeded
Details
janky Jenkins build Docker-PRs 40124 has succeeded
Details
windowsRS1 Jenkins build Docker-PRs-WoW-RS1 11199 has succeeded
Details

@thaJeztah thaJeztah deleted the thaJeztah:17.03.x-fix-autoremove-on-older-api branch Mar 9, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment