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
This commit is contained in:
Dominique Leuenberger 2017-01-31 11:46:50 +00:00 committed by Git OBS Bridge
commit 9b65e9a53d
3 changed files with 13 additions and 4 deletions

View File

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

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

View File

@ -111,9 +111,6 @@ BuildRequires: go-go-md2man
%else %else
BuildRequires: gcc6-go >= 6.1 BuildRequires: gcc6-go >= 6.1
%endif %endif
%if 0%{?is_opensuse}
ExcludeArch: s390x
%endif
%description %description
Docker complements LXC with a high-level API which operates at the process Docker complements LXC with a high-level API which operates at the process