From 4530a22964f6b0363e5ac684cbb0403e894df1e5 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Wed, 28 Dec 2022 06:37:17 +0000 Subject: [PATCH 1/3] moby: update to 23.0.0-rc.1 release notes: - https://github.com/moby/moby/releases/tag/v23.0.0-rc.1 --- .../addon-depends/docker/moby/package.mk | 6 +-- ...moby-001-user-addon-storage-location.patch | 48 ------------------- 2 files changed, 3 insertions(+), 51 deletions(-) diff --git a/packages/addons/addon-depends/docker/moby/package.mk b/packages/addons/addon-depends/docker/moby/package.mk index 50e6df98bd..6d43994712 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-beta.1" -PKG_SHA256="cae782316ce3e699912260ac117c5b279496009a6ede761fd0418fa9d2b5b8a5" +PKG_VERSION="23.0.0-rc.1" +PKG_SHA256="fb7e439a2271331bdb76360e7813ae34baac6b8aab99834f4cda5c8188f6fbb3" 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="a89b84221c8560e7a3dee2a653353429e7628424" +export PKG_GIT_COMMIT="cba986b340906e5718ad8496d3b4cb4207d92b62" PKG_MOBY_BUILDTAGS="daemon \ autogen \ 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 6354be2fb8..a7741a6263 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 @@ -62,54 +62,6 @@ diff -Naur a/integration/plugin/graphdriver/external_test.go b/integration/plugi err = os.WriteFile(specFile, b, 0644) assert.NilError(t, err) } -diff -Naur a/integration-cli/docker_cli_daemon_test.go b/integration-cli/docker_cli_daemon_test.go ---- a/integration-cli/docker_cli_daemon_test.go 2022-06-03 10:30:24.000000000 -0700 -+++ b/integration-cli/docker_cli_daemon_test.go 2022-06-07 14:28:05.556328610 -0700 -@@ -558,12 +558,12 @@ - - func (s *DockerDaemonSuite) TestDaemonKeyGeneration(c *testing.T) { - // TODO: skip or update for Windows daemon -- os.Remove("/etc/docker/key.json") -+ os.Remove("/storage/.kodi/userdata/addon_data/service.system.docker/config/key.json") - c.Setenv("DOCKER_ALLOW_SCHEMA1_PUSH_DONOTUSE", "1") - s.d.Start(c) - s.d.Stop(c) - -- k, err := libtrust.LoadKeyFile("/etc/docker/key.json") -+ k, err := libtrust.LoadKeyFile("/storage/.kodi/userdata/addon_data/service.system.docker/config/key.json") - if err != nil { - c.Fatalf("Error opening key file") - } -@@ -1212,13 +1212,13 @@ - Y string `json:"y"` - } - -- os.Remove("/etc/docker/key.json") -+ os.Remove("/storage/.kodi/userdata/addon_data/service.system.docker/config/key.json") - c.Setenv("DOCKER_ALLOW_SCHEMA1_PUSH_DONOTUSE", "1") - s.d.Start(c) - s.d.Stop(c) - - config := &Config{} -- bytes, err := os.ReadFile("/etc/docker/key.json") -+ bytes, err := os.ReadFile("/storage/.kodi/userdata/addon_data/service.system.docker/config/key.json") - if err != nil { - c.Fatalf("Error reading key.json file: %s", err) - } -@@ -1238,11 +1238,11 @@ - } - - // write back -- if err := os.WriteFile("/etc/docker/key.json", newBytes, 0400); err != nil { -+ if err := os.WriteFile("/storage/.kodi/userdata/addon_data/service.system.docker/config/key.json", newBytes, 0400); err != nil { - c.Fatalf("Error os.WriteFile: %s", err) - } - -- defer os.Remove("/etc/docker/key.json") -+ defer os.Remove("/storage/.kodi/userdata/addon_data/service.system.docker/config/key.json") - - if err := s.d.StartWithError(); err == nil { - c.Fatalf("It should not be successful to start daemon with wrong key: %v", err) diff -Naur a/integration-cli/docker_cli_external_volume_driver_test.go b/integration-cli/docker_cli_external_volume_driver_test.go --- a/integration-cli/docker_cli_external_volume_driver_test.go 2022-06-03 10:30:24.000000000 -0700 +++ b/integration-cli/docker_cli_external_volume_driver_test.go 2022-06-07 14:28:05.556328610 -0700 From e68bb0d8d0d38a9c9cd79ac8ca1d8be0f9828bf6 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Wed, 28 Dec 2022 06:40:09 +0000 Subject: [PATCH 2/3] cli: update to 23.0.0-rc.1 log: - https://github.com/docker/cli/compare/v23.0.0-beta.1...v23.0.0-rc.1 --- 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 b1f40a24d3..a25e6f471c 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="a51348d961d959473c701dcfd291bda8b78a9652ec7692f517b44858a5593da2" +PKG_SHA256="fbf1b949fc13656d18d2993820057ebf1861b5a4075582c78da6c1a893ad7af7" 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="65d3f7830d8f73aeabe649ca17386f5ae5655210" +export PKG_GIT_COMMIT="139e924690b9b3f5e49c86d93a4025da9d47c6a9" configure_target() { go_configure From 89406a1bed65e56110930efd863b5b32d9bb174b Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Wed, 28 Dec 2022 06:41:34 +0000 Subject: [PATCH 3/3] docker: update to 23.0.0-rc.1 and addon (3) --- 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 cde23b95f9..647faacab2 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="2" +PKG_REV="3" PKG_ARCH="any" PKG_LICENSE="ASL" PKG_SITE="http://www.docker.com/"