Fix docker apparmor

This commit is contained in:
Pascal Vizeli
2018-05-02 01:01:38 +02:00
parent b0212beec3
commit 3566873d08
4 changed files with 63 additions and 3 deletions

View File

@@ -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)

View File

@@ -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); \

View File

@@ -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