From 3566873d08d281e4e293e284c5d8bf762db24143 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Wed, 2 May 2018 01:01:38 +0200 Subject: [PATCH] Fix docker apparmor --- .../0013-Add-apparmor-support-to-docker.patch | 60 +++++++++++++++++++ .../docker-containerd/docker-containerd.mk | 1 + .../package/docker-engine/docker-engine.mk | 2 +- buildroot/package/runc/runc.mk | 3 +- 4 files changed, 63 insertions(+), 3 deletions(-) create mode 100644 buildroot-patches/0013-Add-apparmor-support-to-docker.patch diff --git a/buildroot-patches/0013-Add-apparmor-support-to-docker.patch b/buildroot-patches/0013-Add-apparmor-support-to-docker.patch new file mode 100644 index 000000000..6aeca9863 --- /dev/null +++ b/buildroot-patches/0013-Add-apparmor-support-to-docker.patch @@ -0,0 +1,60 @@ +From a5d50577d81efeccb4904e6b56793f84b7e3e89f Mon Sep 17 00:00:00 2001 +From: Pascal Vizeli +Date: Tue, 1 May 2018 23:35:05 +0200 +Subject: [PATCH 1/1] Add apparmor support to docker + +--- + package/docker-containerd/docker-containerd.mk | 1 + + package/docker-engine/docker-engine.mk | 2 +- + package/runc/runc.mk | 3 +-- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk +index 230307d..9be658d 100644 +--- a/package/docker-containerd/docker-containerd.mk ++++ b/package/docker-containerd/docker-containerd.mk +@@ -18,6 +18,7 @@ DOCKER_CONTAINERD_MAKE_ENV = $(HOST_GO_TARGET_ENV) \ + GOBIN="$(@D)/bin" \ + GOPATH="$(DOCKER_CONTAINERD_GOPATH)" + ++DOCKER_CONTAINERD_BUILD_TAGS = apparmor + DOCKER_CONTAINERD_GLDFLAGS = \ + -X github.com/containerd/containerd.GitCommit=$(DOCKER_CONTAINERD_COMMIT) + +diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk +index e3dde03..d500e71 100644 +--- a/package/docker-engine/docker-engine.mk ++++ b/package/docker-engine/docker-engine.mk +@@ -27,7 +27,7 @@ DOCKER_ENGINE_GLDFLAGS = \ + -X github.com/docker/cli/cli.GitCommit=$(DOCKER_ENGINE_VERSION) \ + -X github.com/docker/cli/cli.Version=$(DOCKER_ENGINE_VERSION) + +-DOCKER_ENGINE_BUILD_TAGS = cgo exclude_graphdriver_zfs autogen ++DOCKER_ENGINE_BUILD_TAGS = cgo exclude_graphdriver_zfs autogen apparmor + DOCKER_ENGINE_BUILD_TARGETS = cli:docker + DOCKER_ENGINE_BUILD_TARGET_PARSE = \ + export targetpkg=$$(echo $(target) | cut -d: -f1); \ +diff --git a/package/runc/runc.mk b/package/runc/runc.mk +index f19fc5f..1ab0b70 100644 +--- a/package/runc/runc.mk ++++ b/package/runc/runc.mk +@@ -18,6 +18,7 @@ RUNC_MAKE_ENV = $(HOST_GO_TARGET_ENV) \ + GOPATH="$(RUNC_GOPATH)" \ + PATH=$(BR_PATH) + ++RUNC_GOTAGS = cgo apparmor + RUNC_GLDFLAGS = \ + -X main.gitCommit=$(RUNC_VERSION) + +@@ -26,8 +27,6 @@ RUNC_GLDFLAGS += -extldflags '-static' + RUNC_GOTAGS += static_build + endif + +-RUNC_GOTAGS = cgo +- + ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) + RUNC_GOTAGS += seccomp + RUNC_DEPENDENCIES += libseccomp host-pkgconf +-- +2.7.4 + diff --git a/buildroot/package/docker-containerd/docker-containerd.mk b/buildroot/package/docker-containerd/docker-containerd.mk index 230307d6b..9be658dc0 100644 --- a/buildroot/package/docker-containerd/docker-containerd.mk +++ b/buildroot/package/docker-containerd/docker-containerd.mk @@ -18,6 +18,7 @@ DOCKER_CONTAINERD_MAKE_ENV = $(HOST_GO_TARGET_ENV) \ GOBIN="$(@D)/bin" \ GOPATH="$(DOCKER_CONTAINERD_GOPATH)" +DOCKER_CONTAINERD_BUILD_TAGS = apparmor DOCKER_CONTAINERD_GLDFLAGS = \ -X github.com/containerd/containerd.GitCommit=$(DOCKER_CONTAINERD_COMMIT) diff --git a/buildroot/package/docker-engine/docker-engine.mk b/buildroot/package/docker-engine/docker-engine.mk index e3dde0318..d500e71b3 100644 --- a/buildroot/package/docker-engine/docker-engine.mk +++ b/buildroot/package/docker-engine/docker-engine.mk @@ -27,7 +27,7 @@ DOCKER_ENGINE_GLDFLAGS = \ -X github.com/docker/cli/cli.GitCommit=$(DOCKER_ENGINE_VERSION) \ -X github.com/docker/cli/cli.Version=$(DOCKER_ENGINE_VERSION) -DOCKER_ENGINE_BUILD_TAGS = cgo exclude_graphdriver_zfs autogen +DOCKER_ENGINE_BUILD_TAGS = cgo exclude_graphdriver_zfs autogen apparmor DOCKER_ENGINE_BUILD_TARGETS = cli:docker DOCKER_ENGINE_BUILD_TARGET_PARSE = \ export targetpkg=$$(echo $(target) | cut -d: -f1); \ diff --git a/buildroot/package/runc/runc.mk b/buildroot/package/runc/runc.mk index f19fc5f06..1ab0b70a5 100644 --- a/buildroot/package/runc/runc.mk +++ b/buildroot/package/runc/runc.mk @@ -18,6 +18,7 @@ RUNC_MAKE_ENV = $(HOST_GO_TARGET_ENV) \ GOPATH="$(RUNC_GOPATH)" \ PATH=$(BR_PATH) +RUNC_GOTAGS = cgo apparmor RUNC_GLDFLAGS = \ -X main.gitCommit=$(RUNC_VERSION) @@ -26,8 +27,6 @@ RUNC_GLDFLAGS += -extldflags '-static' RUNC_GOTAGS += static_build endif -RUNC_GOTAGS = cgo - ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) RUNC_GOTAGS += seccomp RUNC_DEPENDENCIES += libseccomp host-pkgconf