* Update Buildroot to 2019-02.3 * Fix enter script * Update ova_defconfig * Fix network manager * Remove runc patches * Use same docker version * Fix build * Fix vmtools * Fix depens * Fix handling with tempfiles * Fix permission handling * Fix cp * Cleanup * Fix mounts
45 lines
1.9 KiB
Diff
45 lines
1.9 KiB
Diff
From 9759621540997500a9dc0163506a8eac1e4769cc Mon Sep 17 00:00:00 2001
|
|
From: Pascal Vizeli <pvizeli@syshack.ch>
|
|
Date: Wed, 26 Jun 2019 09:57:05 +0000
|
|
Subject: [PATCH 1/1] docker-containerd: bump to v1.2.7
|
|
|
|
Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
|
|
---
|
|
package/docker-containerd/docker-containerd.hash | 2 +-
|
|
package/docker-containerd/docker-containerd.mk | 3 ++-
|
|
2 files changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/package/docker-containerd/docker-containerd.hash b/package/docker-containerd/docker-containerd.hash
|
|
index 525191c651..163a519d36 100644
|
|
--- a/package/docker-containerd/docker-containerd.hash
|
|
+++ b/package/docker-containerd/docker-containerd.hash
|
|
@@ -1,3 +1,3 @@
|
|
# Computed locally
|
|
-sha256 f2d578b743fb9faa5b3477b7cf4b33d00501087043a53b27754f14bbe741f891 docker-containerd-v1.2.6.tar.gz
|
|
+sha256 7179c709a0d187708a1eeddcbdecd7206b2c642dc4413bcdb049cd6b38d06801 docker-containerd-v1.2.7.tar.gz
|
|
sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE
|
|
diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk
|
|
index c67b36e7dc..4c0877ecd1 100644
|
|
--- a/package/docker-containerd/docker-containerd.mk
|
|
+++ b/package/docker-containerd/docker-containerd.mk
|
|
@@ -4,7 +4,7 @@
|
|
#
|
|
################################################################################
|
|
|
|
-DOCKER_CONTAINERD_VERSION = v1.2.6
|
|
+DOCKER_CONTAINERD_VERSION = v1.2.7
|
|
DOCKER_CONTAINERD_SITE = $(call github,containerd,containerd,$(DOCKER_CONTAINERD_VERSION))
|
|
DOCKER_CONTAINERD_LICENSE = Apache-2.0
|
|
DOCKER_CONTAINERD_LICENSE_FILES = LICENSE
|
|
@@ -17,6 +17,7 @@ DOCKER_CONTAINERD_LDFLAGS = \
|
|
DOCKER_CONTAINERD_BUILD_TARGETS = cmd/ctr cmd/containerd cmd/containerd-shim
|
|
|
|
DOCKER_CONTAINERD_INSTALL_BINS = containerd containerd-shim
|
|
+DOCKER_CONTAINERD_TAGS = apparmor
|
|
|
|
ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
|
|
DOCKER_CONTAINERD_DEPENDENCIES += libseccomp host-pkgconf
|
|
--
|
|
2.17.1
|
|
|