SHA256
1
0
forked from pool/docker

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
This commit is contained in:
Dan Čermák 2024-02-26 11:16:23 +00:00 committed by Git OBS Bridge
parent febbaafee6
commit 6245febf22
2 changed files with 12 additions and 0 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Feb 22 14:13:42 UTC 2024 - Thorsten Kukuk <kukuk@suse.com>
- Allow to disable apparmor support (ALP supports only SELinux)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 17 12:56:22 UTC 2024 - Danish Prakash <danish.prakash@suse.com> Wed Feb 17 12:56:22 UTC 2024 - Danish Prakash <danish.prakash@suse.com>

View File

@ -16,6 +16,7 @@
# #
# nodebuginfo # nodebuginfo
%bcond_without apparmor
# Where important update information will be stored, such that an administrator # Where important update information will be stored, such that an administrator
# is guaranteed to see the relevant warning. # is guaranteed to see the relevant warning.
@ -77,7 +78,9 @@ BuildRequires: bash-completion
BuildRequires: ca-certificates BuildRequires: ca-certificates
BuildRequires: device-mapper-devel >= 1.2.68 BuildRequires: device-mapper-devel >= 1.2.68
BuildRequires: fdupes BuildRequires: fdupes
%if %{with apparmor}
BuildRequires: libapparmor-devel BuildRequires: libapparmor-devel
%endif
BuildRequires: libbtrfs-devel >= 3.8 BuildRequires: libbtrfs-devel >= 3.8
BuildRequires: libseccomp-devel >= 2.2 BuildRequires: libseccomp-devel >= 2.2
BuildRequires: libtool BuildRequires: libtool
@ -90,6 +93,7 @@ BuildRequires: go-go-md2man
BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libsystemd)
BuildRequires: sysuser-tools BuildRequires: sysuser-tools
BuildRequires: golang(API) = 1.20 BuildRequires: golang(API) = 1.20
%if %{with apparmor}
%if 0%{?sle_version} >= 150000 %if 0%{?sle_version} >= 150000
# This conditional only works on rpm>=4.13, which SLE 12 doesn't have. But we # 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. # don't need to support Docker+selinux for SLE 12 anyway.
@ -103,6 +107,9 @@ Recommends: apparmor-parser
%else %else
Requires: apparmor-parser Requires: apparmor-parser
%endif %endif
%else
Requires: container-selinux
%endif
Requires: ca-certificates-mozilla Requires: ca-certificates-mozilla
# The docker-proxy binary used to be in a separate package. We obsolete it, # 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. # since now docker-proxy is maintained as part of this package.