From 581172d69318a4c0bf01d80692384612d089d774e63a6950c8b08503014d808f Mon Sep 17 00:00:00 2001 From: Vincent Moutoussamy Date: Wed, 28 Sep 2022 13:30:22 +0000 Subject: [PATCH 1/3] Accepting request 991504 from home:fcrozat:branches:Virtualization:containers - Allow to install container-selinux instead of apparmor-parser. OBS-URL: https://build.opensuse.org/request/show/991504 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=373 --- docker.changes | 5 +++++ docker.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docker.changes b/docker.changes index f6f28ee..61d80e5 100644 --- a/docker.changes +++ b/docker.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 28 07:42:33 UTC 2022 - Frederic Crozat + +- Allow to install container-selinux instead of apparmor-parser. + ------------------------------------------------------------------- Wed Jun 29 12:19:55 UTC 2022 - Aleksa Sarai diff --git a/docker.spec b/docker.spec index 3ad7fc1..af9d6e3 100644 --- a/docker.spec +++ b/docker.spec @@ -117,7 +117,7 @@ BuildRequires: pkgconfig(libsystemd) # Due to a limitation in openSUSE's Go packaging we cannot have a BuildRequires # for 'golang(API) >= 1.17' here, so just require 1.17 exactly. bsc#1172608 BuildRequires: go1.17 -Requires: apparmor-parser +Requires: apparmor-parser or container-selinux Requires: ca-certificates-mozilla # The docker-proxy binary used to be in a separate package. We obsolete it, # since now docker-proxy is maintained as part of this package. From 7a4e4491f34c2c33ea0196429c032066979b4042d1ba6150417b2ab906c2f5a6 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Thu, 29 Sep 2022 07:47:00 +0000 Subject: [PATCH 2/3] Accepting request 1006846 from home:favogt:branches:Virtualization:containers - Fix syntax of boolean dependency OBS-URL: https://build.opensuse.org/request/show/1006846 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=374 --- docker.changes | 5 +++++ docker.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docker.changes b/docker.changes index 61d80e5..6fdbe49 100644 --- a/docker.changes +++ b/docker.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 29 07:27:03 UTC 2022 - Fabian Vogt + +- Fix syntax of boolean dependency + ------------------------------------------------------------------- Thu Jul 28 07:42:33 UTC 2022 - Frederic Crozat diff --git a/docker.spec b/docker.spec index af9d6e3..1ad3bb1 100644 --- a/docker.spec +++ b/docker.spec @@ -117,7 +117,7 @@ BuildRequires: pkgconfig(libsystemd) # Due to a limitation in openSUSE's Go packaging we cannot have a BuildRequires # for 'golang(API) >= 1.17' here, so just require 1.17 exactly. bsc#1172608 BuildRequires: go1.17 -Requires: apparmor-parser or container-selinux +Requires: (apparmor-parser or container-selinux) Requires: ca-certificates-mozilla # The docker-proxy binary used to be in a separate package. We obsolete it, # since now docker-proxy is maintained as part of this package. From fbf0679b269f7f235a12c8a56cc050a935b13aad1602318825dba1d5c83c3b7e Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Thu, 29 Sep 2022 08:58:41 +0000 Subject: [PATCH 3/3] Accepting request 1006864 from home:cyphar:docker - Add apparmor-parser as a Recommends to make sure that most users will end up with it installed even if they are primarily running SELinux. OBS-URL: https://build.opensuse.org/request/show/1006864 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=375 --- docker.changes | 6 ++++++ docker.spec | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/docker.changes b/docker.changes index 6fdbe49..c8dcb06 100644 --- a/docker.changes +++ b/docker.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 29 08:40:35 UTC 2022 - Aleksa Sarai + +- Add apparmor-parser as a Recommends to make sure that most users will end up + with it installed even if they are primarily running SELinux. + ------------------------------------------------------------------- Thu Sep 29 07:27:03 UTC 2022 - Fabian Vogt diff --git a/docker.spec b/docker.spec index 1ad3bb1..4e3d1e9 100644 --- a/docker.spec +++ b/docker.spec @@ -140,6 +140,12 @@ Requires: xz >= 4.9 Requires(post): %fillup_prereq Requires(post): udev Requires(post): shadow +# This recommends is added to make sure that even if you have container-selinux +# installed you will still be prompted to install apparmor-parser which Docker +# requires to apply AppArmor profiles (for SELinux systems this doesn't matter +# but if you switch back to AppArmor on reboot this would result in insecure +# containers). +Recommends: apparmor-parser # Not necessary, but must be installed when the underlying system is # configured to use lvm and the user doesn't explicitly provide a # different storage-driver than devicemapper