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

Accepting request 512811 from Virtualization:containers

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/512811
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/docker?expand=0&rev=57
This commit is contained in:
Dominique Leuenberger 2017-07-30 09:26:14 +00:00 committed by Git OBS Bridge
commit 8f54946f95
3 changed files with 45 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
docker.changes
View File

@ -1,3 +1,32 @@
-------------------------------------------------------------------
Wed Jul 19 18:12:26 UTC 2017 - jmassaguerpla@suse.com
- enable deferred removal for sle12sp2 and newer (and openSUSE
equivalent. fix bsc#1021227
-------------------------------------------------------------------
Wed Jul 19 17:17:04 UTC 2017 - jmassaguerpla@suse.com
- enable libseccomp on sle12sp2 and newer, 42.2 and newer
fix bsc#1028638 - docker: conditional filtering not supported on
libseccomp for sle12
-------------------------------------------------------------------
Tue Jul 11 10:50:12 UTC 2017 - jmassaguerpla@suse.com
- add SuSEfirewall2.service to the After clause in docker.service
in order to fix bsc#1046024
-------------------------------------------------------------------
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

4
docker.service
View File

@ -1,7 +1,7 @@
[Unit]
Description=Docker Application Container Engine
Documentation=http://docs.docker.com
After=network.target containerd.socket containerd.service lvm2-monitor.service
After=network.target containerd.socket containerd.service lvm2-monitor.service SuSEfirewall2.service
Requires=containerd.socket containerd.service
[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

23
docker.spec
View File

@ -65,9 +65,16 @@ BuildRequires: device-mapper-devel >= 1.2.68
BuildRequires: glibc-devel-static
BuildRequires: libapparmor-devel
BuildRequires: libbtrfs-devel >= 3.8
# If not leap 42.1 (120100), not sle12sp1 (120100) and not sle12 (1315)
# enable libseccomp
%if 0%{?sle_version} != 120100 && 0%{?suse_version} != 1315
# enable libseccomp for sle >= sle12sp2
%if 0%{?sle_version} >= 120200
%define with_libseccomp 1
%endif
# enable libseccomp for leap >= 42.2
%if 0%{?leap_version} >= 420200
%define with_libseccomp 1
%endif
# enable libseccomp for Factory
%if 0%{?suse_version} > 1320
%define with_libseccomp 1
%endif
%if 0%{?with_libseccomp}
@ -87,7 +94,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
@ -180,11 +187,9 @@ BUILDTAGS="exclude_graphdriver_aufs apparmor selinux pkcs11"
%if 0%{?with_libseccomp}
BUILDTAGS="seccomp $BUILDTAGS"
%endif
# Note that these commands do not allow %%elseif.
# For versions equal to or below SLE12 && openSUSE_13.2 libdevmapper.h is not
# recent enough to define dm_task_deferred_remove(). (This is not true of
# SLE12_SP1 but we cannot distinguish it with this macro.)
%if 0%{?suse_version} <= 1320
# For SLE12 libdevmapper.h is not recent enough to define
# dm_task_deferred_remove().
%if 0%{?sle_version} == 120000
BUILDTAGS="libdm_no_deferred_remove $BUILDTAGS"
%endif