Hello community,
here is the log from the commit of package docker for openSUSE:Factory checked
in at 2017-07-30 11:26:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/docker (Old)
and /work/SRC/openSUSE:Factory/.docker.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docker"
Sun Jul 30 11:26:14 2017 rev:57 rq:512811 version:17.04.0_ce
Changes:
--------
--- /work/SRC/openSUSE:Factory/docker/docker.changes 2017-06-21
13:52:10.841780602 +0200
+++ /work/SRC/openSUSE:Factory/.docker.new/docker.changes 2017-07-30
11:26:35.980001604 +0200
@@ -1,0 +2,29 @@
+Wed Jul 19 18:12:26 UTC 2017 - jmassaguer...@suse.com
+
+- enable deferred removal for sle12sp2 and newer (and openSUSE
+ equivalent. fix bsc#1021227
+
+-------------------------------------------------------------------
+Wed Jul 19 17:17:04 UTC 2017 - jmassaguer...@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 - jmassaguer...@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 - th...@suse.de
+
+- fix path to docker-runc in systemd service file
+
+-------------------------------------------------------------------
+Thu Jul 6 14:18:29 UTC 2017 - th...@suse.de
+
+- change dependency to docker-runc
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ docker.spec ++++++
--- /var/tmp/diff_new_pack.cfiPLB/_old 2017-07-30 11:26:37.059849231 +0200
+++ /var/tmp/diff_new_pack.cfiPLB/_new 2017-07-30 11:26:37.067848102 +0200
@@ -65,9 +65,16 @@
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 @@
# 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 @@
%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
++++++ docker.service ++++++
--- /var/tmp/diff_new_pack.cfiPLB/_old 2017-07-30 11:26:37.223826092 +0200
+++ /var/tmp/diff_new_pack.cfiPLB/_new 2017-07-30 11:26:37.223826092 +0200
@@ -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 @@
# 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
