Accepting request 453400 from Virtualization:containers

1

OBS-URL: https://build.opensuse.org/request/show/453400
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/docker?expand=0&rev=51

docker.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+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
+
+- 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
 

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
 

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