pool/docker
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 452786 from home:jordimassaguerpla:branch:Vc:fix_runtime_docker

Browse Source 
- 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

OBS-URL: https://build.opensuse.org/request/show/452786
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=166
This commit is contained in:
Aleksa Sarai 2017-01-27 16:27:14 +00:00 committed by Git OBS Bridge
parent 9dd652a377
commit e29a1fcaf0
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker.changes
View File

@ -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 Fri Jan 13 13:56:15 UTC 2017 - jmassaguerpla@suse.com

2
docker.service
View File

@ -11,7 +11,7 @@ EnvironmentFile=/etc/sysconfig/docker
# enabled by default because enabling socket activation means that on boot your # enabled by default because enabling socket activation means that on boot your
# containers won't start until someone tries to administer the Docker daemon. # containers won't start until someone tries to administer the Docker daemon.
Type=simple 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 ExecStartPost=/usr/lib/docker/docker_service_helper.sh wait
ExecReload=/bin/kill -s HUP $MAINPID ExecReload=/bin/kill -s HUP $MAINPID