Hello community, here is the log from the commit of package docker for openSUSE:Factory checked in at 2016-07-12 23:51:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-01 09:58:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.docker.new/docker.changes 2016-07-12 23:51:40.000000000 +0200 @@ -1,0 +2,13 @@ +Tue Jul 5 17:52:58 UTC 2016 - [email protected] + +- fix bsc#984942: audit.rules in docker-1.9.1-58.1.x86_64.rpm has a + syntax error + +------------------------------------------------------------------- +Tue Jul 5 14:26:45 UTC 2016 - [email protected] + +* Update docker.service to include changes from upstream, including the + soon-to-be-merged patch https://github.com/docker/docker/pull/24307, + which fixes bnc#983015. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docker-audit.rules ++++++ --- /var/tmp/diff_new_pack.pJoaQL/_old 2016-07-12 23:51:42.000000000 +0200 +++ /var/tmp/diff_new_pack.pJoaQL/_new 2016-07-12 23:51:42.000000000 +0200 @@ -1,7 +1,7 @@ ## # Audit rules based on CIS Docker 1.6 Benchmark v1.0.0 # https://benchmarks.cisecurity.org/tools2/docker/CIS_Docker_1.6_Benchmark_v1.0.0.pdf -# Not all of these apply to SUSE. +# Not all of these apply to SUSE. # 1.8 Audit docker daemon -w /usr/bin/docker -k docker # 1.9 Audit Docker files and directories @@ -23,5 +23,5 @@ # 1.17 Audit Docker files and directories - /etc/sysconfig/docker-storage -w /etc/sysconfig/docker-storage -k docker # 1.18 Audit Docker files and directories - /etc/default/docker --w /etc/default/docker-k docker +-w /etc/default/docker -k docker ## end docker audit rules ++++++ docker.service ++++++ --- /var/tmp/diff_new_pack.pJoaQL/_old 2016-07-12 23:51:42.000000000 +0200 +++ /var/tmp/diff_new_pack.pJoaQL/_new 2016-07-12 23:51:42.000000000 +0200 @@ -7,10 +7,19 @@ [Service] EnvironmentFile=/etc/sysconfig/docker ExecStart=/usr/bin/docker daemon -H fd:// --containerd /run/containerd/containerd.sock $DOCKER_NETWORK_OPTIONS $DOCKER_OPTS -LimitNOFILE=1048576 -LimitNPROC=1048576 +ExecReload=/bin/kill -s HUP $MAINPID +# Having non-zero Limit*s causes performance problems due to accounting overhead +# in the kernel. We recommend using cgroups to do container-local accounting. +LimitNOFILE=infinity +LimitNPROC=infinity LimitCORE=infinity +# Uncomment TasksMax if your systemd version supports it. +# Only systemd 226 and above support this version. +#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 [Install] WantedBy=multi-user.target -
