From 2c2c83d31e6d543b21e73eac033736d3853ca8561ac9bc743c353cd925bfacb7 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Wed, 28 Mar 2018 09:48:12 +0000 Subject: [PATCH] Accepting request 591549 from home:cyphar:containers_docker-init - Add requirement for catatonit, which provides a docker-init implementation. fate#324652 OBS-URL: https://build.opensuse.org/request/show/591549 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=237 --- docker.changes | 6 ++++++ docker.spec | 3 +++ 2 files changed, 9 insertions(+) diff --git a/docker.changes b/docker.changes index 9e5a225..6d1efdc 100644 --- a/docker.changes +++ b/docker.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 27 10:13:41 UTC 2018 - asarai@suse.com + +- Add requirement for catatonit, which provides a docker-init implementation. + fate#324652 + ------------------------------------------------------------------- Tue Feb 13 10:45:58 UTC 2018 - asarai@suse.com diff --git a/docker.spec b/docker.spec index f858dfd..edb2065 100644 --- a/docker.spec +++ b/docker.spec @@ -106,6 +106,9 @@ Requires: fix_bsc_1057743 # runC or containerd (which would be bad). Requires: containerd-git = %{required_containerd} Requires: docker-runc-git = %{required_dockerrunc} +# Needed for --init support. We don't use "tini", we use our own implementation +# which handles edge-cases better. +Requires: catatonit # Provides mkfs.ext4 - used by Docker when devicemapper storage driver is used Requires: e2fsprogs Requires: git-core >= 1.7