From b3bb2aabb8ed5a8af0a9f48fb5aba3f39af38e0d Mon Sep 17 00:00:00 2001 From: Tibor Vass Date: Fri, 21 Sep 2018 22:58:34 +0000 Subject: [PATCH] Remove 'docker-' prefix for containerd and runc binaries This allows to run the daemon in environments that have upstream containerd installed. Signed-off-by: Tibor Vass (cherry picked from commit 34eede0296bce6a9c335cb429f10728ae3f4252d) Signed-off-by: Tibor Vass --- api/swagger.yaml | 4 +- builder/builder-next/executor_unix.go | 2 +- cmd/dockerd/daemon.go | 39 ++++++++++++------- contrib/docker-machine-install-bundle.sh | 2 +- daemon/daemon_unix.go | 6 +-- hack/dockerfile/install/containerd.installer | 6 +-- hack/dockerfile/install/runc.installer | 2 +- hack/make/.binary-setup | 8 ++-- hack/make/.integration-test-helpers | 2 +- integration-cli/check_test.go | 2 +- integration-cli/docker_cli_daemon_test.go | 8 ++-- internal/test/daemon/daemon.go | 1 - libcontainerd/supervisor/remote_daemon.go | 4 +- .../supervisor/remote_daemon_linux.go | 4 +- .../supervisor/remote_daemon_windows.go | 4 +- 15 files changed, 52 insertions(+), 42 deletions(-) diff --git a/api/swagger.yaml b/api/swagger.yaml index 54871c6f53..10076632cc 100644 --- a/api/swagger.yaml +++ b/api/swagger.yaml @@ -3848,10 +3848,10 @@ definitions: $ref: "#/definitions/Runtime" default: runc: - path: "docker-runc" + path: "runc" example: runc: - path: "docker-runc" + path: "runc" runc-master: path: "/go/bin/runc" custom: diff --git a/builder/builder-next/executor_unix.go b/builder/builder-next/executor_unix.go index 94d8bb7660..b3ea33c05c 100644 --- a/builder/builder-next/executor_unix.go +++ b/builder/builder-next/executor_unix.go @@ -27,7 +27,7 @@ func newExecutor(root, cgroupParent string, net libnetwork.NetworkController) (e } return runcexecutor.New(runcexecutor.Opt{ Root: filepath.Join(root, "executor"), - CommandCandidates: []string{"docker-runc", "runc"}, + CommandCandidates: []string{"runc"}, DefaultCgroupParent: cgroupParent, }, networkProviders) } diff --git a/cmd/dockerd/daemon.go b/cmd/dockerd/daemon.go index aba6b1e06c..839537316a 100644 --- a/cmd/dockerd/daemon.go +++ b/cmd/dockerd/daemon.go @@ -10,6 +10,7 @@ import ( "strings" "time" + containerddefaults "github.com/containerd/containerd/defaults" "github.com/docker/distribution/uuid" "github.com/docker/docker/api" apiserver "github.com/docker/docker/api/server" @@ -140,22 +141,25 @@ func (cli *DaemonCli) start(opts *daemonOptions) (err error) { ctx, cancel := context.WithCancel(context.Background()) if cli.Config.ContainerdAddr == "" && runtime.GOOS != "windows" { - opts, err := cli.getContainerdDaemonOpts() - if err != nil { - cancel() - return fmt.Errorf("Failed to generate containerd options: %v", err) + if !systemContainerdRunning() { + opts, err := cli.getContainerdDaemonOpts() + if err != nil { + cancel() + return fmt.Errorf("Failed to generate containerd options: %v", err) + } + + r, err := supervisor.Start(ctx, filepath.Join(cli.Config.Root, "containerd"), filepath.Join(cli.Config.ExecRoot, "containerd"), opts...) + if err != nil { + cancel() + return fmt.Errorf("Failed to start containerd: %v", err) + } + cli.Config.ContainerdAddr = r.Address() + + // Try to wait for containerd to shutdown + defer r.WaitTimeout(10 * time.Second) + } else { + cli.Config.ContainerdAddr = containerddefaults.DefaultAddress } - - r, err := supervisor.Start(ctx, filepath.Join(cli.Config.Root, "containerd"), filepath.Join(cli.Config.ExecRoot, "containerd"), opts...) - if err != nil { - cancel() - return fmt.Errorf("Failed to start containerd: %v", err) - } - - cli.Config.ContainerdAddr = r.Address() - - // Try to wait for containerd to shutdown - defer r.WaitTimeout(10 * time.Second) } defer cancel() @@ -661,3 +665,8 @@ func validateAuthzPlugins(requestedPlugins []string, pg plugingetter.PluginGette } return nil } + +func systemContainerdRunning() bool { + _, err := os.Lstat(containerddefaults.DefaultAddress) + return err == nil +} diff --git a/contrib/docker-machine-install-bundle.sh b/contrib/docker-machine-install-bundle.sh index 860598943b..eff821799c 100755 --- a/contrib/docker-machine-install-bundle.sh +++ b/contrib/docker-machine-install-bundle.sh @@ -31,7 +31,7 @@ bundle_files(){ echo $BUNDLE/binary-daemon/$f fi done - for f in docker-containerd docker-containerd-ctr docker-containerd-shim docker-init docker-runc; do + for f in containerd ctr containerd-shim docker-init runc; do echo $BUNDLE/binary-daemon/$f done if [ -d $BUNDLE/dynbinary-client ]; then diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go index c4fc72cedb..07f88786fa 100644 --- a/daemon/daemon_unix.go +++ b/daemon/daemon_unix.go @@ -54,11 +54,11 @@ import ( const ( // DefaultShimBinary is the default shim to be used by containerd if none // is specified - DefaultShimBinary = "docker-containerd-shim" + DefaultShimBinary = "containerd-shim" // DefaultRuntimeBinary is the default runtime to be used by // containerd if none is specified - DefaultRuntimeBinary = "docker-runc" + DefaultRuntimeBinary = "runc" // See https://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/tree/kernel/sched/sched.h?id=8cd9234c64c584432f6992fe944ca9e46ca8ea76#n269 linuxMinCPUShares = 2 @@ -76,7 +76,7 @@ const ( // DefaultRuntimeName is the default runtime to be used by // containerd if none is specified - DefaultRuntimeName = "docker-runc" + DefaultRuntimeName = "runc" ) type containerGetter interface { diff --git a/hack/dockerfile/install/containerd.installer b/hack/dockerfile/install/containerd.installer index 4be15a6abf..4e5680d1ec 100755 --- a/hack/dockerfile/install/containerd.installer +++ b/hack/dockerfile/install/containerd.installer @@ -30,7 +30,7 @@ install_containerd() { mkdir -p ${PREFIX} - cp bin/containerd ${PREFIX}/docker-containerd - cp bin/containerd-shim ${PREFIX}/docker-containerd-shim - cp bin/ctr ${PREFIX}/docker-containerd-ctr + cp bin/containerd ${PREFIX}/containerd + cp bin/containerd-shim ${PREFIX}/containerd-shim + cp bin/ctr ${PREFIX}/ctr } diff --git a/hack/dockerfile/install/runc.installer b/hack/dockerfile/install/runc.installer index 62263b3c03..ed483e0f40 100755 --- a/hack/dockerfile/install/runc.installer +++ b/hack/dockerfile/install/runc.installer @@ -18,5 +18,5 @@ install_runc() { fi make BUILDTAGS="$RUNC_BUILDTAGS" "$target" mkdir -p ${PREFIX} - cp runc ${PREFIX}/docker-runc + cp runc ${PREFIX}/runc } diff --git a/hack/make/.binary-setup b/hack/make/.binary-setup index 15de89fe10..69bb39b364 100644 --- a/hack/make/.binary-setup +++ b/hack/make/.binary-setup @@ -1,9 +1,9 @@ #!/usr/bin/env bash DOCKER_DAEMON_BINARY_NAME='dockerd' -DOCKER_RUNC_BINARY_NAME='docker-runc' -DOCKER_CONTAINERD_BINARY_NAME='docker-containerd' -DOCKER_CONTAINERD_CTR_BINARY_NAME='docker-containerd-ctr' -DOCKER_CONTAINERD_SHIM_BINARY_NAME='docker-containerd-shim' +DOCKER_RUNC_BINARY_NAME='runc' +DOCKER_CONTAINERD_BINARY_NAME='containerd' +DOCKER_CONTAINERD_CTR_BINARY_NAME='ctr' +DOCKER_CONTAINERD_SHIM_BINARY_NAME='containerd-shim' DOCKER_PROXY_BINARY_NAME='docker-proxy' DOCKER_INIT_BINARY_NAME='docker-init' diff --git a/hack/make/.integration-test-helpers b/hack/make/.integration-test-helpers index da2bb7cad2..149b653800 100644 --- a/hack/make/.integration-test-helpers +++ b/hack/make/.integration-test-helpers @@ -112,7 +112,7 @@ error_on_leaked_containerd_shims() { fi leftovers=$(ps -ax -o pid,cmd | - awk '$2 == "docker-containerd-shim" && $4 ~ /.*\/bundles\/.*\/test-integration/ { print $1 }') + awk '$2 == "containerd-shim" && $4 ~ /.*\/bundles\/.*\/test-integration/ { print $1 }') if [ -n "$leftovers" ]; then ps aux kill -9 $leftovers 2> /dev/null diff --git a/integration-cli/check_test.go b/integration-cli/check_test.go index 256b9153d2..2282967ee5 100644 --- a/integration-cli/check_test.go +++ b/integration-cli/check_test.go @@ -32,7 +32,7 @@ const ( privateRegistryURL = registry.DefaultURL // path to containerd's ctr binary - ctrBinary = "docker-containerd-ctr" + ctrBinary = "ctr" // the docker daemon binary to use dockerdBinary = "dockerd" diff --git a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_cli_daemon_test.go index edb2a7b6c9..9986e8a6b1 100644 --- a/integration-cli/docker_cli_daemon_test.go +++ b/integration-cli/docker_cli_daemon_test.go @@ -44,6 +44,8 @@ import ( "gotest.tools/icmd" ) +const containerdSocket = "/run/containerd/containerd.sock" // "/var/run/docker/containerd/docker-containerd.sock" + // TestLegacyDaemonCommand test starting docker daemon using "deprecated" docker daemon // command. Remove this test when we remove this. func (s *DockerDaemonSuite) TestLegacyDaemonCommand(c *check.C) { @@ -1449,7 +1451,7 @@ func (s *DockerDaemonSuite) TestCleanupMountsAfterDaemonAndContainerKill(c *chec c.Assert(d.Kill(), check.IsNil) // kill the container - icmd.RunCommand(ctrBinary, "--address", "/var/run/docker/containerd/docker-containerd.sock", + icmd.RunCommand(ctrBinary, "--address", containerdSocket, "--namespace", moby_daemon.ContainersNamespace, "tasks", "kill", id).Assert(c, icmd.Success) // restart daemon. @@ -1971,7 +1973,7 @@ func (s *DockerDaemonSuite) TestDaemonRestartWithKilledRunningContainer(t *check } // kill the container - icmd.RunCommand(ctrBinary, "--address", "/var/run/docker/containerd/docker-containerd.sock", + icmd.RunCommand(ctrBinary, "--address", containerdSocket, "--namespace", moby_daemon.ContainersNamespace, "tasks", "kill", cid).Assert(t, icmd.Success) // Give time to containerd to process the command if we don't @@ -2074,7 +2076,7 @@ func (s *DockerDaemonSuite) TestDaemonRestartWithUnpausedRunningContainer(t *che // resume the container result := icmd.RunCommand( ctrBinary, - "--address", "/var/run/docker/containerd/docker-containerd.sock", + "--address", containerdSocket, "--namespace", moby_daemon.ContainersNamespace, "tasks", "resume", cid) result.Assert(t, icmd.Success) diff --git a/internal/test/daemon/daemon.go b/internal/test/daemon/daemon.go index 8c04c3158f..5e87f21b48 100644 --- a/internal/test/daemon/daemon.go +++ b/internal/test/daemon/daemon.go @@ -224,7 +224,6 @@ func (d *Daemon) StartWithLogFile(out *os.File, providedArgs ...string) error { return errors.Wrapf(err, "[%s] could not find docker binary in $PATH", d.id) } args := append(d.GlobalFlags, - "--containerd", "/var/run/docker/containerd/docker-containerd.sock", "--data-root", d.Root, "--exec-root", d.execRoot, "--pidfile", fmt.Sprintf("%s/docker.pid", d.Folder), diff --git a/libcontainerd/supervisor/remote_daemon.go b/libcontainerd/supervisor/remote_daemon.go index 1dcfbe176b..095300f753 100644 --- a/libcontainerd/supervisor/remote_daemon.go +++ b/libcontainerd/supervisor/remote_daemon.go @@ -27,8 +27,8 @@ const ( shutdownTimeout = 15 * time.Second startupTimeout = 15 * time.Second configFile = "containerd.toml" - binaryName = "docker-containerd" - pidFile = "docker-containerd.pid" + binaryName = "containerd" + pidFile = "containerd.pid" ) type pluginConfigs struct { diff --git a/libcontainerd/supervisor/remote_daemon_linux.go b/libcontainerd/supervisor/remote_daemon_linux.go index 1ea91d2b5d..799399c07b 100644 --- a/libcontainerd/supervisor/remote_daemon_linux.go +++ b/libcontainerd/supervisor/remote_daemon_linux.go @@ -11,8 +11,8 @@ import ( ) const ( - sockFile = "docker-containerd.sock" - debugSockFile = "docker-containerd-debug.sock" + sockFile = "containerd.sock" + debugSockFile = "containerd-debug.sock" ) func (r *remote) setDefaults() { diff --git a/libcontainerd/supervisor/remote_daemon_windows.go b/libcontainerd/supervisor/remote_daemon_windows.go index bcdc9529e0..9b254ef58a 100644 --- a/libcontainerd/supervisor/remote_daemon_windows.go +++ b/libcontainerd/supervisor/remote_daemon_windows.go @@ -7,8 +7,8 @@ import ( ) const ( - grpcPipeName = `\\.\pipe\docker-containerd-containerd` - debugPipeName = `\\.\pipe\docker-containerd-debug` + grpcPipeName = `\\.\pipe\containerd-containerd` + debugPipeName = `\\.\pipe\containerd-debug` ) func (r *remote) setDefaults() {