Skip to content

Commit 34eede0

Browse files
author
Tibor Vass
committed
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 <tibor@docker.com>
1 parent 2a63a5f commit 34eede0

File tree

15 files changed

+51
-41
lines changed

15 files changed

+51
-41
lines changed

‎api/swagger.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3848,10 +3848,10 @@ definitions:
38483848
$ref: "#/definitions/Runtime"
38493849
default:
38503850
runc:
3851-
path: "docker-runc"
3851+
path: "runc"
38523852
example:
38533853
runc:
3854-
path: "docker-runc"
3854+
path: "runc"
38553855
runc-master:
38563856
path: "/go/bin/runc"
38573857
custom:

‎builder/builder-next/executor_unix.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func newExecutor(root, cgroupParent string, net libnetwork.NetworkController) (e
2727
}
2828
return runcexecutor.New(runcexecutor.Opt{
2929
Root: filepath.Join(root, "executor"),
30-
CommandCandidates: []string{"docker-runc", "runc"},
30+
CommandCandidates: []string{"runc"},
3131
DefaultCgroupParent: cgroupParent,
3232
}, networkProviders)
3333
}

‎cmd/dockerd/daemon.go‎

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"strings"
1111
"time"
1212

13+
containerddefaults "github.com/containerd/containerd/defaults"
1314
"github.com/docker/distribution/uuid"
1415
"github.com/docker/docker/api"
1516
apiserver "github.com/docker/docker/api/server"
@@ -140,22 +141,25 @@ func (cli *DaemonCli) start(opts *daemonOptions) (err error) {
140141

141142
ctx, cancel := context.WithCancel(context.Background())
142143
if cli.Config.ContainerdAddr == "" && runtime.GOOS != "windows" {
143-
opts, err := cli.getContainerdDaemonOpts()
144-
if err != nil {
145-
cancel()
146-
return errors.Wrap(err, "failed to generate containerd options")
147-
}
148-
149-
r, err := supervisor.Start(ctx, filepath.Join(cli.Config.Root, "containerd"), filepath.Join(cli.Config.ExecRoot, "containerd"), opts...)
150-
if err != nil {
151-
cancel()
152-
return errors.Wrap(err, "failed to start containerd")
153-
}
144+
if !systemContainerdRunning() {
145+
opts, err := cli.getContainerdDaemonOpts()
146+
if err != nil {
147+
cancel()
148+
return errors.Wrap(err, "failed to generate containerd options")
149+
}
154150

155-
cli.Config.ContainerdAddr = r.Address()
151+
r, err := supervisor.Start(ctx, filepath.Join(cli.Config.Root, "containerd"), filepath.Join(cli.Config.ExecRoot, "containerd"), opts...)
152+
if err != nil {
153+
cancel()
154+
return errors.Wrap(err, "failed to start containerd")
155+
}
156+
cli.Config.ContainerdAddr = r.Address()
156157

157-
// Try to wait for containerd to shutdown
158-
defer r.WaitTimeout(10 * time.Second)
158+
// Try to wait for containerd to shutdown
159+
defer r.WaitTimeout(10 * time.Second)
160+
} else {
161+
cli.Config.ContainerdAddr = containerddefaults.DefaultAddress
162+
}
159163
}
160164
defer cancel()
161165

@@ -661,3 +665,8 @@ func validateAuthzPlugins(requestedPlugins []string, pg plugingetter.PluginGette
661665
}
662666
return nil
663667
}
668+
669+
func systemContainerdRunning() bool {
670+
_, err := os.Lstat(containerddefaults.DefaultAddress)
671+
return err == nil
672+
}

‎contrib/docker-machine-install-bundle.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ bundle_files(){
3131
echo $BUNDLE/binary-daemon/$f
3232
fi
3333
done
34-
for f in docker-containerd docker-containerd-ctr docker-containerd-shim docker-init docker-runc; do
34+
for f in containerd ctr containerd-shim docker-init runc; do
3535
echo $BUNDLE/binary-daemon/$f
3636
done
3737
if [ -d $BUNDLE/dynbinary-client ]; then

‎daemon/daemon_unix.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ import (
5454
const (
5555
// DefaultShimBinary is the default shim to be used by containerd if none
5656
// is specified
57-
DefaultShimBinary = "docker-containerd-shim"
57+
DefaultShimBinary = "containerd-shim"
5858

5959
// DefaultRuntimeBinary is the default runtime to be used by
6060
// containerd if none is specified
61-
DefaultRuntimeBinary = "docker-runc"
61+
DefaultRuntimeBinary = "runc"
6262

6363
// See https://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/tree/kernel/sched/sched.h?id=8cd9234c64c584432f6992fe944ca9e46ca8ea76#n269
6464
linuxMinCPUShares = 2
@@ -76,7 +76,7 @@ const (
7676

7777
// DefaultRuntimeName is the default runtime to be used by
7878
// containerd if none is specified
79-
DefaultRuntimeName = "docker-runc"
79+
DefaultRuntimeName = "runc"
8080
)
8181

8282
type containerGetter interface {

‎hack/dockerfile/install/containerd.installer‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ install_containerd() {
3030

3131
mkdir -p ${PREFIX}
3232

33-
cp bin/containerd ${PREFIX}/docker-containerd
34-
cp bin/containerd-shim ${PREFIX}/docker-containerd-shim
35-
cp bin/ctr ${PREFIX}/docker-containerd-ctr
33+
cp bin/containerd ${PREFIX}/containerd
34+
cp bin/containerd-shim ${PREFIX}/containerd-shim
35+
cp bin/ctr ${PREFIX}/ctr
3636
}

‎hack/dockerfile/install/runc.installer‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ install_runc() {
1818
fi
1919
make BUILDTAGS="$RUNC_BUILDTAGS" "$target"
2020
mkdir -p ${PREFIX}
21-
cp runc ${PREFIX}/docker-runc
21+
cp runc ${PREFIX}/runc
2222
}

‎hack/make/.binary-setup‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/usr/bin/env bash
22

33
DOCKER_DAEMON_BINARY_NAME='dockerd'
4-
DOCKER_RUNC_BINARY_NAME='docker-runc'
5-
DOCKER_CONTAINERD_BINARY_NAME='docker-containerd'
6-
DOCKER_CONTAINERD_CTR_BINARY_NAME='docker-containerd-ctr'
7-
DOCKER_CONTAINERD_SHIM_BINARY_NAME='docker-containerd-shim'
4+
DOCKER_RUNC_BINARY_NAME='runc'
5+
DOCKER_CONTAINERD_BINARY_NAME='containerd'
6+
DOCKER_CONTAINERD_CTR_BINARY_NAME='ctr'
7+
DOCKER_CONTAINERD_SHIM_BINARY_NAME='containerd-shim'
88
DOCKER_PROXY_BINARY_NAME='docker-proxy'
99
DOCKER_INIT_BINARY_NAME='docker-init'

‎hack/make/.integration-test-helpers‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ error_on_leaked_containerd_shims() {
112112
fi
113113

114114
leftovers=$(ps -ax -o pid,cmd |
115-
awk '$2 == "docker-containerd-shim" && $4 ~ /.*\/bundles\/.*\/test-integration/ { print $1 }')
115+
awk '$2 == "containerd-shim" && $4 ~ /.*\/bundles\/.*\/test-integration/ { print $1 }')
116116
if [ -n "$leftovers" ]; then
117117
ps aux
118118
kill -9 $leftovers 2> /dev/null

‎integration-cli/check_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const (
3232
privateRegistryURL = registry.DefaultURL
3333

3434
// path to containerd's ctr binary
35-
ctrBinary = "docker-containerd-ctr"
35+
ctrBinary = "ctr"
3636

3737
// the docker daemon binary to use
3838
dockerdBinary = "dockerd"

0 commit comments

Comments
 (0)