aboutsummaryrefslogtreecommitdiff
path: root/package/docker-containerd
diff options
context:
space:
mode:
Diffstat (limited to 'package/docker-containerd')
-rw-r--r--package/docker-containerd/docker-containerd.hash2
-rw-r--r--package/docker-containerd/docker-containerd.mk28
2 files changed, 17 insertions, 13 deletions
diff --git a/package/docker-containerd/docker-containerd.hash b/package/docker-containerd/docker-containerd.hash
index 4b32d62649..c5cfc137b8 100644
--- a/package/docker-containerd/docker-containerd.hash
+++ b/package/docker-containerd/docker-containerd.hash
@@ -1,3 +1,3 @@
# Computed locally
-sha256 d6284c69e1933e4c05fe285feebef461efe8cd2030634dcf1cbdcde46abe86be docker-containerd-1.4.0.tar.gz
+sha256 bc6d9452c700af0ebc09c0da8ddba55be4c03ac8928e72ca92d98905800c8018 docker-containerd-1.4.3.tar.gz
sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE
diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk
index 67060e3ff6..626889e5f4 100644
--- a/package/docker-containerd/docker-containerd.mk
+++ b/package/docker-containerd/docker-containerd.mk
@@ -4,19 +4,31 @@
#
################################################################################
-DOCKER_CONTAINERD_VERSION = 1.4.0
+DOCKER_CONTAINERD_VERSION = 1.4.3
DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,v$(DOCKER_CONTAINERD_VERSION))
DOCKER_CONTAINERD_LICENSE = Apache-2.0
DOCKER_CONTAINERD_LICENSE_FILES = LICENSE
+DOCKER_CONTAINERD_CPE_ID_VENDOR = linuxfoundation
+DOCKER_CONTAINERD_CPE_ID_PRODUCT = containerd
DOCKER_CONTAINERD_GOMOD = github.com/containerd/containerd
DOCKER_CONTAINERD_LDFLAGS = \
- -X github.com/docker/containerd.GitCommit=$(DOCKER_CONTAINERD_VERSION)
+ -X $(DOCKER_CONTAINERD_GOMOD)/version.Version=$(DOCKER_CONTAINERD_VERSION)
-DOCKER_CONTAINERD_BUILD_TARGETS = cmd/ctr cmd/containerd cmd/containerd-shim
+DOCKER_CONTAINERD_BUILD_TARGETS = \
+ cmd/containerd \
+ cmd/containerd-shim \
+ cmd/containerd-shim-runc-v1 \
+ cmd/containerd-shim-runc-v2 \
+ cmd/ctr
-DOCKER_CONTAINERD_INSTALL_BINS = containerd containerd-shim
+DOCKER_CONTAINERD_INSTALL_BINS = $(notdir $(DOCKER_CONTAINERD_BUILD_TARGETS))
+
+ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y)
+DOCKER_CONTAINERD_DEPENDENCIES += libapparmor
+DOCKER_CONTAINERD_TAGS += apparmor
+endif
ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
DOCKER_CONTAINERD_DEPENDENCIES += libseccomp host-pkgconf
@@ -29,12 +41,4 @@ else
DOCKER_CONTAINERD_TAGS += no_btrfs
endif
-define DOCKER_CONTAINERD_INSTALL_SYMLINKS
- ln -fs runc $(TARGET_DIR)/usr/bin/docker-runc
- ln -fs containerd-shim $(TARGET_DIR)/usr/bin/docker-containerd-shim
- ln -fs containerd $(TARGET_DIR)/usr/bin/docker-containerd
-endef
-
-DOCKER_CONTAINERD_POST_INSTALL_TARGET_HOOKS += DOCKER_CONTAINERD_INSTALL_SYMLINKS
-
$(eval $(golang-package))