Hello community,
here is the log from the commit of package docker_1_12_6 for openSUSE:Factory
checked in at 2017-09-23 21:37:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/docker_1_12_6 (Old)
and /work/SRC/openSUSE:Factory/.docker_1_12_6.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docker_1_12_6"
Sat Sep 23 21:37:12 2017 rev:2 rq:528270 version:1.12.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/docker_1_12_6/docker_1_12_6.changes
2017-09-15 22:31:54.462424976 +0200
+++ /work/SRC/openSUSE:Factory/.docker_1_12_6.new/docker_1_12_6.changes
2017-09-23 21:37:18.744283607 +0200
@@ -1,0 +2,10 @@
+Fri Sep 22 09:58:47 UTC 2017 - vrothb...@suse.com
+
+- Fix bsc#1059011
+
+ The systemd service helper script used a timeout of 60 seconds to
+ start the daemon, which is insufficient in cases where the daemon
+ takes longer to start. Instead, set the service type from 'simple' to
+ 'notify' and remove the now superfluous helper script.
+
+-------------------------------------------------------------------
Old:
----
docker_service_helper.sh
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ docker_1_12_6.spec ++++++
--- /var/tmp/diff_new_pack.Rhtjb3/_old 2017-09-23 21:37:20.456042872 +0200
+++ /var/tmp/diff_new_pack.Rhtjb3/_new 2017-09-23 21:37:20.460042310 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package docker
+# spec file for package docker_1_12_6
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
@@ -60,7 +60,6 @@
Source8: docker-audit.rules
Source9: docker-update-message.txt
Source10: tests.sh
-Source11: docker_service_helper.sh
# Fixes for architecture-specific issues (gcc-go).
Patch100: gcc-go-patches.patch
Patch102: netlink_netns_powerpc.patch
@@ -126,11 +125,11 @@
Conflicts: docker-libnetwork
Conflicts: docker > 1.12.6
Provides: docker = 1.12.6
-BuildRoot: %{_tmppath}/%{_name}-%{version}-build
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExcludeArch: %ix86 s390 ppc
%ifarch %{go_arches}
-BuildRequires: golang(API) = 1.6
BuildRequires: go-go-md2man
+BuildRequires: golang(API) = 1.6
%else
BuildRequires: gcc6-go >= 6.1
%endif
@@ -356,7 +355,6 @@
#
install -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{_name}.service
ln -sf service %{buildroot}%{_sbindir}/rcdocker
-install -D -m 0755 %{SOURCE11} %{buildroot}/%{_libexecdir}/docker/
#
# udev rules that prevents dolphin to show all docker devices and slows down
++++++ docker.service ++++++
--- /var/tmp/diff_new_pack.Rhtjb3/_old 2017-09-23 21:37:20.664013624 +0200
+++ /var/tmp/diff_new_pack.Rhtjb3/_new 2017-09-23 21:37:20.664013624 +0200
@@ -10,9 +10,8 @@
# While Docker has support for socket activation (-H fd://), this is not
# 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
+Type=notify
ExecStart=/usr/bin/dockerd --containerd /run/containerd/containerd.sock
--add-runtime oci=/usr/bin/docker-runc $DOCKER_NETWORK_OPTIONS $DOCKER_OPTS
-ExecStartPost=/usr/lib/docker/docker_service_helper.sh wait
ExecReload=/bin/kill -s HUP $MAINPID
# Having non-zero Limit*s causes performance problems due to accounting
overhead
