diff --git a/docker.changes b/docker.changes index 1caf2e9..fa4b21e 100644 --- a/docker.changes +++ b/docker.changes @@ -1,8 +1,15 @@ +------------------------------------------------------------------- +Tue Aug 16 09:39:11 UTC 2016 - asarai@suse.com + +* Explicitly state the version dependencies for runC and containerd, to + avoid potential issues with incompatible component versions. These + must be updated *each time we do a release*. bsc#993847 + ------------------------------------------------------------------- Mon Jul 25 05:34:50 UTC 2016 - sflees@suse.de - Don't exit mid install, add the ability to not restart the docker - service during certain updates with long migration phases + service during certain updates with long migration phases bsc#980555 ------------------------------------------------------------------- diff --git a/docker.spec b/docker.spec index dfb6a30..5ec186a 100644 --- a/docker.spec +++ b/docker.spec @@ -67,8 +67,12 @@ BuildRequires: zsh Requires: apparmor-parser Requires: bridge-utils Requires: ca-certificates-mozilla -# Containerd is required as it is the only currently supported execdriver of Docker. -Requires: containerd +# Containerd and runC are required as they are the only currently supported +# execdrivers of Docker. NOTE: The version pinning here matches upstream's +# Dockerfile to ensure that we don't use a slightly incompatible version of +# runC or containerd (which would be bad). +Requires: containerd = 0.2.2 +Requires: runc = 0.1.1 # Provides mkfs.ext4 - used by Docker when devicemapper storage driver is used Requires: e2fsprogs Requires: git-core >= 1.7