From e29a1fcaf096708640da7824676996cd64465984c772d9f93ef8590bba287ddb Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Fri, 27 Jan 2017 16:27:14 +0000 Subject: [PATCH 1/2] Accepting request 452786 from home:jordimassaguerpla:branch:Vc:fix_runtime_docker - 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 --- docker.changes | 7 +++++++ docker.service | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) 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 From e41683b0fbafa77898c78aab616f00ad547abc95379478e84816d3d024164021 Mon Sep 17 00:00:00 2001 From: Jordi Massaguer Date: Mon, 30 Jan 2017 09:45:07 +0000 Subject: [PATCH 2/2] Accepting request 453067 from openSUSE:Factory:zSystems please remove that artificial excludearch s390x for opensuse OBS-URL: https://build.opensuse.org/request/show/453067 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=167 --- docker.changes | 5 +++++ docker.spec | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docker.changes b/docker.changes index 1a8e0cf..779dc97 100644 --- a/docker.changes +++ b/docker.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 27 12:30:18 UTC 2017 - bg@suse.com + +- enable architecture s390x for openSUSE + ------------------------------------------------------------------- Thu Jan 26 15:43:38 UTC 2017 - jmassaguerpla@suse.com diff --git a/docker.spec b/docker.spec index 82d8c07..553f681 100644 --- a/docker.spec +++ b/docker.spec @@ -111,9 +111,6 @@ BuildRequires: go-go-md2man %else BuildRequires: gcc6-go >= 6.1 %endif -%if 0%{?is_opensuse} -ExcludeArch: s390x -%endif %description Docker complements LXC with a high-level API which operates at the process