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

[18.09] backport fixing daemon won't start when "runtimes" option defined in both config file and cli#57

Merged
andrewhsu merged 1 commit intodocker-archive:18.09from
AntaresS:cherry-37871
Sep 21, 2018
Merged

[18.09] backport fixing daemon won't start when "runtimes" option defined in both config file and cli#57
andrewhsu merged 1 commit intodocker-archive:18.09from
AntaresS:cherry-37871

Conversation

@AntaresS
Copy link
Copy Markdown

@AntaresS AntaresS commented Sep 20, 2018 

> gcb cherry-37871 upstream/18.09
> git cherry-pick -x 8392d0930b511402aa7aa71ccfe6c0d4a8159237
[cherry-37871 66ed41aec] fixed the dockerd won't start bug when 'runtimes' field is defined in both daemon config file and cli flags
 Date: Mon Sep 17 15:28:26 2018 -0700
 1 file changed, 12 insertions(+), 2 deletions(-)

Signed-off-by: Anda Xu anda.xu@docker.com
(cherry picked from commit 8392d09)

@AntaresS
fixed the dockerd won't start bug when 'runtimes' field is defined in…
66ed41a 
… both daemon config file and cli flags

Signed-off-by: Anda Xu <anda.xu@docker.com>
(cherry picked from commit 8392d09)
@AntaresS
Copy link
Copy Markdown
Author

AntaresS commented Sep 20, 2018

cc @andrewhsu @thaJeztah

@crosbymichael
Copy link
Copy Markdown

crosbymichael commented Sep 20, 2018

LGTM

@andrewhsu andrewhsu added this to the 18.09.0 milestone Sep 20, 2018
andrewhsu
andrewhsu approved these changes Sep 20, 2018
View reviewed changes
Copy link
Copy Markdown

@andrewhsu andrewhsu left a comment

Choose a reason for hiding this comment

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

LGTM on green

thaJeztah
thaJeztah approved these changes Sep 20, 2018
View reviewed changes
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@AntaresS
Copy link
Copy Markdown
Author

AntaresS commented Sep 20, 2018 •
edited
Loading

Other than one flaky test
FAIL: docker_cli_swarm_test.go:1143: DockerSwarmSuite.TestSwarmLockUnlockCluster, the rest is green.

@crosbymichael
Copy link
Copy Markdown

crosbymichael commented Sep 21, 2018

This can be merged

@andrewhsu andrewhsu merged commit 90a90ae into docker-archive:18.09 Sep 21, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

2 more reviewers

@andrewhsu andrewhsu andrewhsu approved these changes

@thaJeztah thaJeztah thaJeztah approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

18.09.0

Development

Successfully merging this pull request may close these issues.

4 participants

@AntaresS @crosbymichael @andrewhsu @thaJeztah