From 7df22a1f0a06a485ba72556a9f382f91ec1662ce Mon Sep 17 00:00:00 2001
From: Gerard Ryan <G.M0N3Y.2503@gmail.com>
Date: Thu, 24 Sep 2020 18:15:15 +1000
Subject: [PATCH 1/2] containerd: Updated to 1.3.7 * libseccomp seems to be a
requirement for compilation now
Signed-off-by: Gerard Ryan <G.M0N3Y.2503@gmail.com>
---
utils/containerd/Makefile | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/utils/containerd/Makefile b/utils/containerd/Makefile
index d9b5c38f9..2811a84fd 100644
--- a/utils/containerd/Makefile
+++ b/utils/containerd/Makefile
@@ -1,15 +1,15 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=containerd
-PKG_VERSION:=1.2.13
-PKG_RELEASE:=2
+PKG_VERSION:=1.3.7
+PKG_RELEASE:=1
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/containerd/containerd/tar.gz/v${PKG_VERSION}?
-PKG_HASH:=0811057ab67b78ce911416e793edaeb14b3f1e105d67b8e67b6302e0eab572e4
-PKG_SOURCE_VERSION:=7ad184331fa3e55e52b890ea95e65ba581ae3429
+PKG_HASH:=d30d59e143697aa4f0960205b3f5ac59c573b332f20507740ef2dc0fb5ae8ded
+PKG_SOURCE_VERSION:=8fba4e9a7d01810a393d5d25a3621dc101981175
PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com>
@@ -28,10 +28,9 @@ config CONTAINERD_SECCOMP
bool "Enable support for seccomp in containerd"
default DOCKER_SECCOMP
select KERNEL_SECCOMP
- select PACKAGE_libseccomp
help
Build containerd with support for seccomp filters.
- Select libseccomp which also pulls-in the needed kernel features.
+ Also pulls-in the needed kernel features.
endef
define Package/containerd
@@ -39,7 +38,7 @@ define Package/containerd
CATEGORY:=Utilities
TITLE:=containerd container runtime
URL:=https://containerd.io/
- DEPENDS:=$(GO_ARCH_DEPENDS) @(aarch64||arm||x86_64) +btrfs-progs +runc +CONTAINERD_SECCOMP:libseccomp
+ DEPENDS:=$(GO_ARCH_DEPENDS) @(aarch64||arm||x86_64) +btrfs-progs +runc +libseccomp
MENU:=1
endef
From a1429ebd1b231cc78075a34f766ab66c1d22fb96 Mon Sep 17 00:00:00 2001
From: Gerard Ryan <G.M0N3Y.2503@gmail.com>
Date: Thu, 24 Sep 2020 18:17:56 +1000
Subject: [PATCH 2/2] docker-ce: Updated to 19.03.13 * Added optional kernel
option to better enable cgroup networking
Signed-off-by: Gerard Ryan <G.M0N3Y.2503@gmail.com>
---
utils/docker-ce/Config.in | 1 +
utils/docker-ce/Makefile | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/utils/docker-ce/Config.in b/utils/docker-ce/Config.in
index 7ccb22aed..e10694f6b 100644
--- a/utils/docker-ce/Config.in
+++ b/utils/docker-ce/Config.in
@@ -39,6 +39,7 @@ config DOCKER_RES_SHAPE
select KERNEL_CGROUP_HUGETLB
select KERNEL_FAIR_GROUP_SCHED
select KERNEL_NET_CLS_CGROUP
+ select KERNEL_CGROUP_NET_CLASSID
select KERNEL_CGROUP_NET_PRIO
select KERNEL_CFS_BANDWIDTH
select KERNEL_RT_GROUP_SCHED
diff --git a/utils/docker-ce/Makefile b/utils/docker-ce/Makefile
index aa0c9131a..1f6c1ee79 100644
--- a/utils/docker-ce/Makefile
+++ b/utils/docker-ce/Makefile
@@ -1,15 +1,15 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=docker-ce
-PKG_VERSION:=19.03.12
-PKG_RELEASE:=7
+PKG_VERSION:=19.03.13
+PKG_RELEASE:=1
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=components/cli/LICENSE components/engine/LICENSE
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/docker/docker-ce/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=d321f959e41fd9b24c23d95779d30d9ead1120bfddedf157ef5c047cf3d997a1
-PKG_SOURCE_VERSION:=48a66213fe # SHA1 used within the docker executables
+PKG_HASH:=b2ff08675738031b6d6d59a90226657c16726851957c11b5fb85a4598b933b92
+PKG_SOURCE_VERSION:=4484c46d9d # SHA1 used within the docker executables
PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com>