From d18e428a3f8617e4ac2248dc74ae81508ea6139c Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 29 Jan 2023 04:03:12 +0000 Subject: [PATCH 1/5] containerd: update to 1.6.16 --- 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 3813f03139..2221ab1307 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.15" -PKG_SHA256="ee170fa73b258e448f9b6729440d38c77d19cd9bec46e45cd195d4670cd8b004" +PKG_VERSION="1.6.16" +PKG_SHA256="e0a893cf67df9dfaecbcde2ba4e896efb3a86ffe48dcfe0d2b26f7cf19b5af3a" PKG_LICENSE="APL" PKG_SITE="https://containerd.io" PKG_URL="https://github.com/containerd/containerd/archive/v${PKG_VERSION}.tar.gz" From 3ae87a27a3644e51274d70c441e8223ebe3f5c32 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 2 Feb 2023 07:27:50 +0000 Subject: [PATCH 2/5] moby: update to 23.0.0 --- packages/addons/addon-depends/docker/moby/package.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/addons/addon-depends/docker/moby/package.mk b/packages/addons/addon-depends/docker/moby/package.mk index 58be4f75a5..f9dc0693d1 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.3" -PKG_SHA256="e04e6715efd41d96a6c2c9e63821f617eec09fccc4d1688aea6227463c4ababb" +PKG_VERSION="23.0.0" +PKG_SHA256="94492508260e57eb93399257d53435cd5308ca6330e173ca6e6f3dbf4c6e12f3" PKG_LICENSE="ASL" PKG_SITE="https://mobyproject.org/" PKG_URL="https://github.com/moby/moby/archive/v${PKG_VERSION}.tar.gz" @@ -12,7 +12,7 @@ PKG_LONGDESC="Moby is an open-source project created by Docker to enable and acc PKG_TOOLCHAIN="manual" # Git commit of the matching release https://github.com/moby/moby -export PKG_GIT_COMMIT="9f62b37a6221c4743a883f6674526180b4125e0c" +export PKG_GIT_COMMIT="d7573ab8672555762688f4c7ab8cc69ae8ec1a47" PKG_MOBY_BUILDTAGS="daemon \ autogen \ From 256e8864ab206a8c52cefbbfd57385363e0330b7 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 2 Feb 2023 07:37:36 +0000 Subject: [PATCH 3/5] cli: update to 23.0.0 --- packages/addons/addon-depends/docker/cli/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/docker/cli/package.mk b/packages/addons/addon-depends/docker/cli/package.mk index bcac844f61..8190628741 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="d9131da5e377994bc81062a352cb0aa9e89c35fdfbb763a5c33d44f241e1267e" +PKG_SHA256="3379d06cd6177832b91f4796c680b6bf15c7895773448716b4c3c5253f611d1b" PKG_LICENSE="ASL" PKG_SITE="https://github.com/docker/cli" PKG_URL="https://github.com/docker/cli/archive/v${PKG_VERSION}.tar.gz" @@ -12,7 +12,7 @@ PKG_LONGDESC="The Docker CLI" PKG_TOOLCHAIN="manual" # Git commit of the matching release https://github.com/docker/cli/releases -export PKG_GIT_COMMIT="e1152b2418833c2e39b7114c1ebb12d2278792a3" +export PKG_GIT_COMMIT="e92dd87c3209361f29b692ab4b8f0f9248779297" configure_target() { go_configure From efeff4a1558f813f2e75489d82535afcb5e3c847 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 2 Feb 2023 07:38:44 +0000 Subject: [PATCH 4/5] docker: update to 23.0.0 and addon (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 ecb0a0dea2..cde23b95f9 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="1" +PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="ASL" PKG_SITE="http://www.docker.com/" From 6b6852f88b86b57e42ca1e9814f0f333350a608f Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Fri, 3 Feb 2023 12:22:05 +0000 Subject: [PATCH 5/5] cli: update path for cli-plugins for LibreELEC image --- .../cli/patches/cli-0001-path-for-cli-plugins.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 packages/addons/addon-depends/docker/cli/patches/cli-0001-path-for-cli-plugins.patch diff --git a/packages/addons/addon-depends/docker/cli/patches/cli-0001-path-for-cli-plugins.patch b/packages/addons/addon-depends/docker/cli/patches/cli-0001-path-for-cli-plugins.patch new file mode 100644 index 0000000000..30b7f71aac --- /dev/null +++ b/packages/addons/addon-depends/docker/cli/patches/cli-0001-path-for-cli-plugins.patch @@ -0,0 +1,11 @@ +--- a/cli-plugins/manager/manager_unix.go 2023-02-03 11:54:16.746399916 +0000 ++++ b/cli-plugins/manager/manager_unix.go 2023-02-03 11:59:04.528175595 +0000 +@@ -4,6 +4,6 @@ + package manager + + var defaultSystemPluginDirs = []string{ +- "/usr/local/lib/docker/cli-plugins", "/usr/local/libexec/docker/cli-plugins", +- "/usr/lib/docker/cli-plugins", "/usr/libexec/docker/cli-plugins", ++ "/storage/.kodi/addons/service.system.docker/cli-plugins", ++ "/storage/.kodi/userdata/addon_data/service.system.docker/docker/cli-plugins", + }