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

Accepting request 508834 from home:thipp:branches:Virtualization:containers

Browse Source 
- fix path to docker-runc in systemd service file 
- change dependency to docker-runc

OBS-URL: https://build.opensuse.org/request/show/508834
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=193
This commit is contained in:
Thomas Hipp 2017-07-10 11:39:04 +00:00 committed by Git OBS Bridge
parent 6d17ff854b
commit 5283b611b2
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docker.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Fri Jul 7 14:53:59 UTC 2017 - thipp@suse.de
- fix path to docker-runc in systemd service file
-------------------------------------------------------------------
Thu Jul 6 14:18:29 UTC 2017 - thipp@suse.de
- change dependency to docker-runc
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jun 19 10:54:36 UTC 2017 - jmassaguerpla@suse.com Mon Jun 19 10:54:36 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 --add-runtime oci=/usr/bin/docker-runc $DOCKER_NETWORK_OPTIONS $DOCKER_OPTS ExecStart=/usr/bin/dockerd --containerd /run/containerd/containerd.sock --add-runtime oci=/usr/sbin/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

2
docker.spec
View File

@ -87,7 +87,7 @@ Requires: docker-libnetwork = 0.0.0+git20170119.7b2b1fe
# Dockerfile to ensure that we don't use a slightly incompatible version of # Dockerfile to ensure that we don't use a slightly incompatible version of
# runC or containerd (which would be bad). # runC or containerd (which would be bad).
Requires: containerd = 0.2.5+gitr639_422e31c Requires: containerd = 0.2.5+gitr639_422e31c
Requires: runc = 0.1.1+gitr2947_9c2d8d1 Requires: docker-runc = 0.1.1+gitr2947_9c2d8d1
# Provides mkfs.ext4 - used by Docker when devicemapper storage driver is used # Provides mkfs.ext4 - used by Docker when devicemapper storage driver is used
Requires: e2fsprogs Requires: e2fsprogs
Requires: git-core >= 1.7 Requires: git-core >= 1.7