From 5283b611b2705348d0c197e72aafb090f4b70e1ae86302ea1de075e93e964ace Mon Sep 17 00:00:00 2001 From: Thomas Hipp Date: Mon, 10 Jul 2017 11:39:04 +0000 Subject: [PATCH] Accepting request 508834 from home:thipp:branches:Virtualization:containers - 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 --- docker.changes | 10 ++++++++++ docker.service | 2 +- docker.spec | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/docker.changes b/docker.changes index e930822..7bb7024 100644 --- a/docker.changes +++ b/docker.changes @@ -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 diff --git a/docker.service b/docker.service index 42d360b..85a9d53 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 --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 ExecReload=/bin/kill -s HUP $MAINPID diff --git a/docker.spec b/docker.spec index 53410ae..9e05e09 100644 --- a/docker.spec +++ b/docker.spec @@ -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 # runC or containerd (which would be bad). 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 Requires: e2fsprogs Requires: git-core >= 1.7