SHA256
1
0
forked from pool/docker

Accepting request 756074 from home:cyphar:docker

- Add backport of https://github.com/docker/docker/pull/39121. bsc#1122469
  + bsc1122469-0001-apparmor-allow-readby-and-tracedby.patch

OBS-URL: https://build.opensuse.org/request/show/756074
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=333
This commit is contained in:
2019-12-12 13:41:28 +00:00
committed by Git OBS Bridge
parent 1a3f9b9afa
commit 28f3e0fe6d
3 changed files with 53 additions and 3 deletions

View File

@@ -77,10 +77,12 @@ Source10: docker-daemon.json
# branch in http://github.com/suse/docker.mirror.
Patch200: secrets-0001-daemon-allow-directory-creation-in-run-secrets.patch
Patch201: secrets-0002-SUSE-implement-SUSE-container-secrets.patch
# SUSE-ISSUE: Revert of https://github.com/docker/docker/pull/37907.
Patch300: packaging-0001-revert-Remove-docker-prefix-for-containerd-and-runc-.patch
# SUSE-BACKPORT: Backport of https://github.com/docker/docker/pull/37353. bsc#1099277
Patch401: bsc1073877-0001-apparmor-clobber-docker-default-profile-on-start.patch
# SUSE-ISSUE: Revert of https://github.com/docker/docker/pull/37907.
Patch402: packaging-0001-revert-Remove-docker-prefix-for-containerd-and-runc-.patch
# SUSE-BACKPORT: Backport of https://github.com/docker/docker/pull/39121. bsc#1122469
Patch402: bsc1122469-0001-apparmor-allow-readby-and-tracedby.patch
# SUSE-FEATURE: Add support to mirror inofficial/private registries
# (https://github.com/docker/docker/pull/34319)
Patch500: private-registry-0001-Add-private-registry-mirror-support.patch
@@ -255,9 +257,11 @@ docker container runtime configuration for kubeadm
%patch200 -p1
%patch201 -p1
%endif
# revert upstream
%patch300 -p1
# bsc#1099277
%patch401 -p1
# revert upstream
# bsc#1122469
%patch402 -p1
%if "%flavour" == "kubic"
# PATCH-SUSE: Mirror patch.