d-two/operating-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump Docker to 20.10.6 (#1328)

Browse Source 
Bump Docker to latest release 20.10.6. Also make sure to upgrade
docker-proxy with various IPv6 releated features and fixes.
This commit is contained in:
Stefan Agner
2021-04-15 18:10:56 +02:00
committed by GitHub
parent 56e0d941d0
commit 05ba57e006
17 changed files with 310 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
buildroot-patches/0001-docker-add-AppArmor-support.patch
View File

@@ -1,8 +1,8 @@
From f8074c7dbf7966fd15edd897130825684abe05e9 Mon Sep 17 00:00:00 2001
Message-Id: <f8074c7dbf7966fd15edd897130825684abe05e9.1614713774.git.stefan@agner.ch>
From 9c98c07abbe9ee675ec588ad7c15f0285e8a0f07 Mon Sep 17 00:00:00 2001
Message-Id: <9c98c07abbe9ee675ec588ad7c15f0285e8a0f07.1618500237.git.stefan@agner.ch>
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Mon, 13 Jan 2020 12:27:06 +0000
Subject: [PATCH 1/5] docker: add AppArmor support
Subject: [PATCH 1/9] docker: add AppArmor support
Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
Signed-off-by: Stefan Agner <stefan@agner.ch>
@@ -11,7 +11,7 @@ Signed-off-by: Stefan Agner <stefan@agner.ch>
1 file changed, 5 insertions(+)
diff --git a/package/docker-containerd/docker-containerd.mk b/package/docker-containerd/docker-containerd.mk
index 626889e5f4..7c74da708f 100644
index e229d9cb54..e968518a69 100644
--- a/package/docker-containerd/docker-containerd.mk
+++ b/package/docker-containerd/docker-containerd.mk
@@ -30,6 +30,11 @@ DOCKER_CONTAINERD_DEPENDENCIES += libapparmor
@@ -27,5 +27,5 @@ index 626889e5f4..7c74da708f 100644
DOCKER_CONTAINERD_DEPENDENCIES += libseccomp host-pkgconf
DOCKER_CONTAINERD_TAGS += seccomp
--
2.30.1
2.31.1