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

[17.12] Ensure containers are stopped on daemon startup#366

Merged
seemethere merged 1 commit intodocker-archive:17.12from
seemethere:cherry_pick_engine_35805
Dec 19, 2017
Merged

[17.12] Ensure containers are stopped on daemon startup#366
seemethere merged 1 commit intodocker-archive:17.12from
seemethere:cherry_pick_engine_35805

Conversation

@seemethere
Copy link
Copy Markdown
Contributor

Cherry Pick

git cherry-pick -x -s -Xsubtree="components/engine" e69127bd5ba4dcf8ae1f248db93a95795eb75b93

Cherry pick was clean

Original Text

When the containerd 1.0 runtime changes were made, we inadvertantly
removed the functionality where any running containers are killed on
startup when not using live-restore.
This change restores that behavior.

Signed-off-by: Brian Goff cpuguy83@gmail.com
(cherry picked from commit e69127b)
Signed-off-by: Eli Uriegas eli.uriegas@docker.com

When the containerd 1.0 runtime changes were made, we inadvertantly
removed the functionality where any running containers are killed on
startup when not using live-restore.
This change restores that behavior.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit e69127b)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
@seemethere seemethere added this to the 17.12.0 milestone Dec 19, 2017
@seemethere seemethere requested review from a team and cpuguy83 December 19, 2017 20:25
Copy link
Copy Markdown
Contributor

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Copy Markdown

@jose-bigio jose-bigio left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@thaJeztah
Copy link
Copy Markdown
Member

original PR; moby/moby#35805

@vieux
Copy link
Copy Markdown
Contributor

vieux commented Dec 19, 2017

LGTM

@seemethere seemethere merged commit aad5f42 into docker-archive:17.12 Dec 19, 2017
@seemethere seemethere deleted the cherry_pick_engine_35805 branch December 19, 2017 22:49
docker-jenkins pushed a commit that referenced this pull request Jul 26, 2019
FIXED retrieving GO_VERSION from the CLI dir
Upstream-commit: fa4ab31
Component: packaging
docker-jenkins pushed a commit that referenced this pull request Sep 20, 2019
…12.9

[19.03 backport] Bump Golang 1.12.9
Upstream-commit: b2823e4609ccf4685d3efb329d149b7d0b8588d6
Component: engine
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Feb 3, 2020
…ine_35805

[17.12] Ensure containers are stopped on daemon startup
akrasnov-drv pushed a commit to drivenets/docker-ce that referenced this pull request Apr 23, 2023
FIXED retrieving GO_VERSION from the CLI dir
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.

5 participants