- 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.
- fix bsc#1057743: Add a Requires: fix_bsc_1057743 which is provided by the
  newer version of docker-libnetwork. This is necessary because of a versioning
  bug we found in bsc#1057743.

OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=213

docker.changes

@@ -48,6 +48,23 @@ Mon Oct  9 11:36:59 UTC 2017 - asarai@suse.com
   * secrets-0001-daemon-allow-directory-creation-in-run-secrets.patch
   * secrets-0002-SUSE-implement-SUSE-container-secrets.patch
 
+-------------------------------------------------------------------
+Mon Oct  2 08:12:17 UTC 2017 - vrothberg@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.
+
+-------------------------------------------------------------------
+Wed Sep 27 15:04:19 UTC 2017 - jmassaguerpla@suse.com
+
+- fix bsc#1057743: Add a Requires: fix_bsc_1057743 which is provided by the
+  newer version of docker-libnetwork. This is necessary because of a versioning
+  bug we found in bsc#1057743.
+
 -------------------------------------------------------------------
 Fri Sep 15 15:32:49 UTC 2017 - jmassaguerpla@suse.com
 

docker.service

@@ -10,7 +10,7 @@ EnvironmentFile=/etc/sysconfig/docker
 # 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/sbin/docker-runc $DOCKER_NETWORK_OPTIONS $DOCKER_OPTS
 ExecReload=/bin/kill -s HUP $MAINPID
 

docker.spec

@@ -102,7 +102,11 @@ BuildRequires:  zsh
 Requires:       apparmor-parser
 Requires:       bridge-utils
 Requires:       ca-certificates-mozilla
+# Required in order for networking to work. fix_bsc_1057743 is a work-around
+# for some old packaging issues (where rpm would delete a binary that was
+# installed by docker-libnetwork). See bsc#1057743 for more details.
 Requires:       docker-libnetwork = 0.7.0+gitr2322_4a242dba7739
+Requires:       fix_bsc_1057743
 # Containerd and runC are required as they are the only currently supported
 # execdrivers of Docker. NOTE: The version pinning here matches upstream's
 # vendor.conf to ensure that we don't use a slightly incompatible version of