forked from pool/docker
- 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
This commit is contained in:
@@ -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
|
||||
|
Reference in New Issue
Block a user