Hello community,

here is the log from the commit of package docker for openSUSE:Factory checked 
in at 2016-07-15 12:54:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/docker (Old)
 and      /work/SRC/openSUSE:Factory/.docker.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "docker"

Changes:
--------
--- /work/SRC/openSUSE:Factory/docker/docker.changes    2016-07-12 
23:51:40.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.docker.new/docker.changes       2016-07-15 
12:54:24.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Jul 13 13:41:33 UTC 2016 - [email protected]
+
+- remove sysconfig.docker.ppc64le patch
+  setting iptables option on ppc64le works now (bsc#988707)
+
+-------------------------------------------------------------------

Old:
----
  sysconfig.docker.ppc64le

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ docker.spec ++++++
--- /var/tmp/diff_new_pack.ODQeIs/_old  2016-07-15 12:54:26.000000000 +0200
+++ /var/tmp/diff_new_pack.ODQeIs/_new  2016-07-15 12:54:26.000000000 +0200
@@ -38,8 +38,6 @@
 Source6:        docker-rpmlintrc
 Source7:        README_SUSE.md
 Source8:        docker-audit.rules
-# TODO: remove once we figure out what is wrong with iptables on ppc64le
-Source100:      sysconfig.docker.ppc64le
 # Required to overcome some limitations of gcc-go: 
https://groups.google.com/forum/#!msg/golang-nuts/SlGCPYkjxo4/4DjcjXRCqAkJ
 Patch101:       gcc-go-patches.patch
 Patch102:       netlink_gcc_go.patch
@@ -226,11 +224,7 @@
 install -D -m 0640 %{SOURCE8} 
%{buildroot}%{_sysconfdir}/audit/rules.d/%{name}.rules
 
 # sysconfig file
-%ifarch ppc64le
-install -D -m 644 %{SOURCE100} 
%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.docker
-%else
 install -D -m 644 %{SOURCE4} 
%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.docker
-%endif
 
 %ifarch %{go_arches}
 # install manpages

++++++ docker.service ++++++
--- /var/tmp/diff_new_pack.ODQeIs/_old  2016-07-15 12:54:26.000000000 +0200
+++ /var/tmp/diff_new_pack.ODQeIs/_new  2016-07-15 12:54:26.000000000 +0200
@@ -14,12 +14,12 @@
 LimitNPROC=infinity
 LimitCORE=infinity
 # Uncomment TasksMax if your systemd version supports it.
-# Only systemd 226 and above support this version.
+# Only systemd 226 and above support this property.
 #TasksMax=infinity
 # Set delegate yes so that systemd does not reset the cgroups of docker 
containers
-Delegate=yes
-# Kill only the docker process, not all processes in the cgroup
-KillMode=process
+# Only systemd 218 and above support this property.
+#Delegate=yes
+# KillMode=process is not necessary because of how we set up containerd.
 
 [Install]
 WantedBy=multi-user.target


Reply via email to