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

[18.09] Remove 'docker-' prefix for containerd and runc binaries #61

Merged
merged 3 commits into from
Sep 26, 2018
Merged

[18.09] Remove 'docker-' prefix for containerd and runc binaries #61

merged 3 commits into from
Sep 26, 2018

Conversation

tiborvass
Copy link

This allows to run the daemon in environments that have upstream containerd installed.

Signed-off-by: Tibor Vass tibor@docker.com
(cherry picked from commit 34eede0)
Signed-off-by: Tibor Vass tibor@docker.com

Remove 'docker-' prefix for containerd and runc binaries
b3bb2aa 
This allows to run the daemon in environments that have upstream containerd installed.

Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 34eede0)
Signed-off-by: Tibor Vass <tibor@docker.com>
@tiborvass
Copy link
Author

From moby#37907

@tiborvass tiborvass added this to the 18.09.0 milestone Sep 24, 2018
@andrewhsu
Copy link

andrewhsu commented Sep 25, 2018 •
edited
Loading

I'm seeing several failures in the experimental PR tests against b3bb2aa:

FAIL: docker_cli_daemon_test.go:1955: DockerDaemonSuite.TestDaemonRestartWithKilledRunningContainer
FAIL: docker_cli_daemon_test.go:1955: DockerDaemonSuite.TestDaemonRestartWithKilledRunningContainer
FAIL: docker_cli_daemon_test.go:2052: DockerDaemonSuite.TestDaemonRestartWithUnpausedRunningContainer
FAIL: docker_cli_daemon_test.go:2521: DockerDaemonSuite.TestRunWithRuntimeFromCommandLine
FAIL: docker_cli_daemon_test.go:2403: DockerDaemonSuite.TestRunWithRuntimeFromConfigFile

perhaps more renames needed in the docker_cli_daemon_test.go?

Tibor Vass added 2 commits September 25, 2018 23:09
hack/make: remove 'docker-' prefix when copying binaries
e090646 
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 361412c)
Signed-off-by: Tibor Vass <tibor@docker.com>
fix daemon tests that were using wrong containerd socket
6bf8dfc 
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 52b60f7)
Signed-off-by: Tibor Vass <tibor@docker.com>
andrewhsu
andrewhsu approved these changes Sep 26, 2018
View reviewed changes
Copy link

@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 needed to work with containerd in separate package

thaJeztah
thaJeztah approved these changes Sep 26, 2018
View reviewed changes
Copy link
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

@seemethere seemethere merged commit 989fab3 into docker-archive:18.09 Sep 26, 2018
@thaJeztah thaJeztah mentioned this pull request Nov 13, 2018
Closed
3 tasks
@sboeuf sboeuf mentioned this pull request Nov 20, 2018
Closed
@axiqia axiqia mentioned this pull request Apr 6, 2019
Closed
@mattpag mattpag mentioned this pull request Jul 9, 2019
Merged
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@dhiltgen dhiltgen dhiltgen approved these changes

@thaJeztah thaJeztah thaJeztah approved these changes

@seemethere seemethere seemethere approved these changes

@andrewhsu andrewhsu andrewhsu approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
18.09.0
Development

Successfully merging this pull request may close these issues.
5 participants
@tiborvass @andrewhsu @seemethere @thaJeztah @dhiltgen