Skip to content

Commit 4df4090

Browse files
committed
daemon: honor default runtime when starting containers
If you created containers from pre-OCI docker (e.g. docker-1.10.x) upgrade may fail when restarting containers if the new docker daemon has `--default-runtime` set. In Fedora, we ship docker 1.12.6 with: ``` --default-runtime=oci --add-runtime oci=/usr/libexec/docker/docker-runc-current ``` That way we don't rely on `docker-runc` being in `$PATH`. The issue is, on upgrade from docker 1.10.3 without this patch, the default runtime in `daemon/start_linux.go` is unconditionally set to `runc=docker-runc` without honoring the `--default-runtime` flag set in the docker daemon. Reproducer: - (1.10.3) `docker run -d -p 5000:5000 --restart=always --name registry registry:2` - upgrade to docker 1.12.6 (1.11.x has likely the same issue) - the registry container fails to restart on upgrade with the following log message `error="exec: \"docker-runc\": executable file not found in $PATH: \"\""` That error comes from the fact that we're setting the runtime in the container's HostConfig to `runc` where instead we should have honored the `--default-runtime` flag (in our case that's set to `oci`). Signed-off-by: Antonio Murdaca <runcom@redhat.com>
1 parent f3e1dc0 commit 4df4090

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

daemon/start_unix.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ func (daemon *Daemon) getLibcontainerdCreateOptions(container *container.Contain
1414

1515
// Ensure a runtime has been assigned to this container
1616
if container.HostConfig.Runtime == "" {
17-
container.HostConfig.Runtime = stockRuntimeName
17+
container.HostConfig.Runtime = daemon.configStore.GetDefaultRuntimeName()
1818
container.ToDisk()
1919
}
2020

0 commit comments

Comments
 (0)