diff --git a/docker.changes b/docker.changes index 51f2ed2..1a8e0cf 100644 --- a/docker.changes +++ b/docker.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jan 26 15:43:38 UTC 2017 - jmassaguerpla@suse.com + +- provide the oci runtime so that containers which were using an old + runtime option, when started on the new docker version, the runtime + is changed to the new one. fix bsc#1020806 bsc#1016992 + ------------------------------------------------------------------- Fri Jan 13 13:56:15 UTC 2017 - jmassaguerpla@suse.com diff --git a/docker.service b/docker.service index f87ec47..e654024 100644 --- a/docker.service +++ b/docker.service @@ -11,7 +11,7 @@ EnvironmentFile=/etc/sysconfig/docker # enabled by default because enabling socket activation means that on boot your # containers won't start until someone tries to administer the Docker daemon. Type=simple -ExecStart=/usr/bin/dockerd --containerd /run/containerd/containerd.sock $DOCKER_NETWORK_OPTIONS $DOCKER_OPTS +ExecStart=/usr/bin/dockerd --containerd /run/containerd/containerd.sock --add-runtime oci=/usr/bin/docker-runc $DOCKER_NETWORK_OPTIONS $DOCKER_OPTS ExecStartPost=/usr/lib/docker/docker_service_helper.sh wait ExecReload=/bin/kill -s HUP $MAINPID