diff options
Diffstat (limited to 'package/docker-engine/docker-engine.mk')
| -rw-r--r-- | package/docker-engine/docker-engine.mk | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 2d92570b94..058960119a 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,8 +4,8 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 19.03.12 -DOCKER_ENGINE_SITE = $(call github,docker,engine,v$(DOCKER_ENGINE_VERSION)) +DOCKER_ENGINE_VERSION = 20.10.1 +DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 DOCKER_ENGINE_LICENSE_FILES = LICENSE @@ -14,12 +14,20 @@ DOCKER_ENGINE_DEPENDENCIES = host-pkgconf DOCKER_ENGINE_GOMOD = github.com/docker/docker DOCKER_ENGINE_LDFLAGS = \ - -X main.GitCommit=$(DOCKER_ENGINE_VERSION) \ - -X main.Version=$(DOCKER_ENGINE_VERSION) + -X $(DOCKER_ENGINE_GOMOD)/dockerversion.BuildTime="" \ + -X $(DOCKER_ENGINE_GOMOD)/dockerversion.GitCommit="buildroot" \ + -X $(DOCKER_ENGINE_GOMOD)/dockerversion.IAmStatic="false" \ + -X $(DOCKER_ENGINE_GOMOD)/dockerversion.InitCommitID="" \ + -X $(DOCKER_ENGINE_GOMOD)/dockerversion.Version="$(DOCKER_ENGINE_VERSION)" -DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs autogen +DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd +ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y) +DOCKER_ENGINE_DEPENDENCIES += libapparmor +DOCKER_ENGINE_TAGS += apparmor +endif + ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) DOCKER_ENGINE_TAGS += seccomp DOCKER_ENGINE_DEPENDENCIES += libseccomp @@ -53,16 +61,6 @@ endif DOCKER_ENGINE_INSTALL_BINS = $(notdir $(DOCKER_ENGINE_BUILD_TARGETS)) -define DOCKER_ENGINE_RUN_AUTOGEN - cd $(@D) && \ - BUILDTIME="$$(date)" \ - VERSION="$(patsubst v%,%,$(DOCKER_ENGINE_VERSION))" \ - PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" $(TARGET_MAKE_ENV) \ - bash ./hack/make/.go-autogen -endef - -DOCKER_ENGINE_POST_CONFIGURE_HOOKS += DOCKER_ENGINE_RUN_AUTOGEN - define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD $(INSTALL) -D -m 0644 $(@D)/contrib/init/systemd/docker.service \ $(TARGET_DIR)/usr/lib/systemd/system/docker.service |