From 6245febf22e59122c4b16eb934f3f76de1049c34021d309ad28f9990cf6127c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Mon, 26 Feb 2024 11:16:23 +0000 Subject: [PATCH] Accepting request 1149534 from home:kukuk:no-utmp - Allow to disable apparmor support (ALP supports only SELinux) OBS-URL: https://build.opensuse.org/request/show/1149534 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=402 --- docker.changes | 5 +++++ docker.spec | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/docker.changes b/docker.changes index 2a4f87e..f5c5577 100644 --- a/docker.changes +++ b/docker.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 22 14:13:42 UTC 2024 - Thorsten Kukuk + +- Allow to disable apparmor support (ALP supports only SELinux) + ------------------------------------------------------------------- Wed Feb 17 12:56:22 UTC 2024 - Danish Prakash diff --git a/docker.spec b/docker.spec index cab22d0..78af2cd 100644 --- a/docker.spec +++ b/docker.spec @@ -16,6 +16,7 @@ # # nodebuginfo +%bcond_without apparmor # Where important update information will be stored, such that an administrator # is guaranteed to see the relevant warning. @@ -77,7 +78,9 @@ BuildRequires: bash-completion BuildRequires: ca-certificates BuildRequires: device-mapper-devel >= 1.2.68 BuildRequires: fdupes +%if %{with apparmor} BuildRequires: libapparmor-devel +%endif BuildRequires: libbtrfs-devel >= 3.8 BuildRequires: libseccomp-devel >= 2.2 BuildRequires: libtool @@ -90,6 +93,7 @@ BuildRequires: go-go-md2man BuildRequires: pkgconfig(libsystemd) BuildRequires: sysuser-tools BuildRequires: golang(API) = 1.20 +%if %{with apparmor} %if 0%{?sle_version} >= 150000 # This conditional only works on rpm>=4.13, which SLE 12 doesn't have. But we # don't need to support Docker+selinux for SLE 12 anyway. @@ -103,6 +107,9 @@ Recommends: apparmor-parser %else Requires: apparmor-parser %endif +%else +Requires: container-selinux +%endif 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.