diff --git a/docker.changes b/docker.changes index 97c327d..1bf41c2 100644 --- a/docker.changes +++ b/docker.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 13 13:41:33 UTC 2016 - cbrauner@suse.de + +- remove sysconfig.docker.ppc64le patch + setting iptables option on ppc64le works now (bsc#988707) + ------------------------------------------------------------------- Tue Jul 5 17:52:58 UTC 2016 - jmassaguerpla@suse.com diff --git a/docker.service b/docker.service index 5ea1fc0..d01eadc 100644 --- a/docker.service +++ b/docker.service @@ -14,12 +14,12 @@ LimitNOFILE=infinity 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 diff --git a/docker.spec b/docker.spec index 7ba7beb..fdb79de 100644 --- a/docker.spec +++ b/docker.spec @@ -38,8 +38,6 @@ Source4: sysconfig.docker 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 0644 %{SOURCE3} %{buildroot}%{_udevrulesdir}/80-%{name}.rules 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 diff --git a/sysconfig.docker.ppc64le b/sysconfig.docker.ppc64le deleted file mode 100644 index d963e0c..0000000 --- a/sysconfig.docker.ppc64le +++ /dev/null @@ -1,10 +0,0 @@ - -## Path : System/Management -## Description : Extra cli switches for docker daemon -## Type : string -## Default : "" -## ServiceRestart : docker -# - -# TODO: remove it once we fix the real issue -DOCKER_OPTS=" -iptables=false "