From 6286563af6ee326c233d2adbc5f47f21cfd689be Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Wed, 26 Jun 2024 05:39:53 +0000 Subject: [PATCH] cli: update to 27.0.2 --- packages/addons/addon-depends/docker/cli/package.mk | 4 ++-- .../cli/patches/cli-0001-path-for-cli-plugins.patch | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/addons/addon-depends/docker/cli/package.mk b/packages/addons/addon-depends/docker/cli/package.mk index af52d9f3ce..634404cba0 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="73f914421db873d1a19d4d15e8ae21bebc35079f3034f574dfc6cd0449edcf89" +PKG_SHA256="a2b31d4c8143c8b126e98a359639f51727fc83fc1e61670efbdeaa7dea92fd5a" 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 tag https://github.com/docker/cli/tags -export PKG_GIT_COMMIT="5650f9b10226d75e8e9a490a31cc3e5b846e0034" +export PKG_GIT_COMMIT="912c1ddf8a3eb97595c5ea967d01c0fc18666409" configure_target() { go_configure 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 index 30b7f71aac..9a574a6070 100644 --- 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 @@ -1,11 +1,13 @@ --- 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 - +@@ -13,8 +13,6 @@ + // + // [ConfigFile.CLIPluginsExtraDirs]: https://pkg.go.dev/github.com/docker/cli@v26.1.4+incompatible/cli/config/configfile#ConfigFile.CLIPluginsExtraDirs 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", +- "/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", }