From 6a6c6aa17028cf0915e1c06ba4a28425b2bddbc919af27329f6a4e4cba5e24ee Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Thu, 9 Nov 2017 12:24:37 +0000 Subject: [PATCH] Accepting request 540191 from home:cyphar:containers:docker_forwardport - 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/request/show/540191 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=215 --- docker.changes | 17 +++++++++++++++++ docker.service | 2 +- docker.spec | 5 ++++- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/docker.changes b/docker.changes index 29ba17a..581c0a8 100644 --- a/docker.changes +++ b/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 diff --git a/docker.service b/docker.service index ea5d855..ead1d5f 100644 --- a/docker.service +++ b/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 diff --git a/docker.spec b/docker.spec index 4ef0b21..1cfe948 100644 --- a/docker.spec +++ b/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 @@ -443,7 +447,6 @@ fi %{_bindir}/docker %{_bindir}/dockerd %{_sbindir}/rcdocker -%{_libexecdir}/docker/ %{_unitdir}/%{name}.service %config %{_sysconfdir}/audit/rules.d/%{name}.rules %{_udevrulesdir}/80-%{name}.rules