From 0478aaf462092845221d6cd3ad08926d1104ebbc Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 12 Jan 2023 12:36:24 +0000 Subject: [PATCH 1/4] cli: update to cli-23.0.0-rc.2 --- packages/addons/addon-depends/docker/cli/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/addon-depends/docker/cli/package.mk b/packages/addons/addon-depends/docker/cli/package.mk index a25e6f471c..7076c48835 100644 --- a/packages/addons/addon-depends/docker/cli/package.mk +++ b/packages/addons/addon-depends/docker/cli/package.mk @@ -3,7 +3,7 @@ PKG_NAME="cli" PKG_VERSION="$(get_pkg_version moby)" -PKG_SHA256="fbf1b949fc13656d18d2993820057ebf1861b5a4075582c78da6c1a893ad7af7" +PKG_SHA256="8db2cc24232bde248b1187bc63b517c0d1ec23d6275fd317c7f43b230feba41f" PKG_LICENSE="ASL" PKG_SITE="https://github.com/docker/cli" PKG_URL="https://github.com/docker/cli/archive/v${PKG_VERSION}.tar.gz" From ae223bdb8a0eeca7a9f85476d78adb3aac388973 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 12 Jan 2023 12:34:02 +0000 Subject: [PATCH 2/4] moby: update to 23.0.0-rc.2 --- packages/addons/addon-depends/docker/moby/package.mk | 4 ++-- .../moby-001-user-addon-storage-location.patch | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/packages/addons/addon-depends/docker/moby/package.mk b/packages/addons/addon-depends/docker/moby/package.mk index 6d43994712..df096e87fa 100644 --- a/packages/addons/addon-depends/docker/moby/package.mk +++ b/packages/addons/addon-depends/docker/moby/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv) PKG_NAME="moby" -PKG_VERSION="23.0.0-rc.1" -PKG_SHA256="fb7e439a2271331bdb76360e7813ae34baac6b8aab99834f4cda5c8188f6fbb3" +PKG_VERSION="23.0.0-rc.2" +PKG_SHA256="934f693ae579359d4ac52c30510f17ec5d7e750dfafecd527965c6b42b6ae558" PKG_LICENSE="ASL" PKG_SITE="https://mobyproject.org/" PKG_URL="https://github.com/moby/moby/archive/v${PKG_VERSION}.tar.gz" diff --git a/packages/addons/addon-depends/docker/moby/patches/moby-001-user-addon-storage-location.patch b/packages/addons/addon-depends/docker/moby/patches/moby-001-user-addon-storage-location.patch index a7741a6263..a78421ab24 100644 --- a/packages/addons/addon-depends/docker/moby/patches/moby-001-user-addon-storage-location.patch +++ b/packages/addons/addon-depends/docker/moby/patches/moby-001-user-addon-storage-location.patch @@ -192,12 +192,15 @@ diff -Naur a/libnetwork/libnetwork_unix_test.go b/libnetwork/libnetwork_unix_tes diff -Naur a/pkg/plugins/discovery_unix.go b/pkg/plugins/discovery_unix.go --- a/pkg/plugins/discovery_unix.go 2022-06-03 10:30:24.000000000 -0700 +++ b/pkg/plugins/discovery_unix.go 2022-06-07 14:28:05.615329505 -0700 -@@ -3,4 +3,4 @@ +@@ -9,7 +9,7 @@ + "github.com/docker/docker/pkg/rootless" + ) - package plugins // import "github.com/docker/docker/pkg/plugins" +-const globalConfigPluginsPath = "/etc/docker/plugins" ++const globalConfigPluginsPath = "/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins" + const globalLibPluginsPath = "/usr/lib/docker/plugins" --var specsPaths = []string{"/etc/docker/plugins", "/usr/lib/docker/plugins"} -+var specsPaths = []string{"/storage/.kodi/userdata/addon_data/service.system.docker/config/plugins", "/usr/lib/docker/plugins"} + var globalSpecsPaths = []string{globalConfigPluginsPath, globalLibPluginsPath} diff -Naur a/pkg/plugins/plugins.go b/pkg/plugins/plugins.go --- a/pkg/plugins/plugins.go 2022-06-03 10:30:24.000000000 -0700 +++ b/pkg/plugins/plugins.go 2022-06-07 14:28:05.616329521 -0700 From 890dacc9a06b71a98f8b8aa27abe327b64e0f807 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 8 Jan 2023 01:44:22 +0000 Subject: [PATCH 3/4] containerd: update to 1.6.15 --- packages/addons/addon-depends/docker/containerd/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/docker/containerd/package.mk b/packages/addons/addon-depends/docker/containerd/package.mk index debaef0758..3813f03139 100644 --- a/packages/addons/addon-depends/docker/containerd/package.mk +++ b/packages/addons/addon-depends/docker/containerd/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="containerd" -PKG_VERSION="1.6.14" -PKG_SHA256="158dd5aa5c6c4aa1f118baee3e30aaaf200b274b9eecfeb75297679a1609bfb7" +PKG_VERSION="1.6.15" +PKG_SHA256="ee170fa73b258e448f9b6729440d38c77d19cd9bec46e45cd195d4670cd8b004" PKG_LICENSE="APL" PKG_SITE="https://containerd.io" PKG_URL="https://github.com/containerd/containerd/archive/v${PKG_VERSION}.tar.gz" From 71405981118979d5cbc3a90e116b21189bfe4ba6 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 12 Jan 2023 12:46:54 +0000 Subject: [PATCH 4/4] docker: update addon (4) - cli: update to cli-23.0.0-rc.2 - containerd: update to 1.6.15 - moby: update to 23.0.0-rc.2 --- packages/addons/service/docker/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/service/docker/package.mk b/packages/addons/service/docker/package.mk index 647faacab2..207eed0c4f 100644 --- a/packages/addons/service/docker/package.mk +++ b/packages/addons/service/docker/package.mk @@ -3,7 +3,7 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="docker" -PKG_REV="3" +PKG_REV="4" PKG_ARCH="any" PKG_LICENSE="ASL" PKG_SITE="http://www.docker.com/"