pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
docker-cli: Honor possible plugins under PREFIX
Module Name: pkgsrc-wip
Committed By: Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By: leot
Date: Thu Jun 23 20:33:42 2022 +0200
Changeset: 9b05b6df0ee4c4081afe32e749842fda998066c7
Modified Files:
docker-cli/Makefile
docker-cli/distinfo
Added Files:
docker-cli/patches/patch-cli-plugins_manager_manager__unix.go
Log Message:
docker-cli: Honor possible plugins under PREFIX
Permit to possibly install Docker plugins under PREFIX.
Mostly intended for docker-compose.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9b05b6df0ee4c4081afe32e749842fda998066c7
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
docker-cli/Makefile | 6 ++++++
docker-cli/distinfo | 1 +
.../patches/patch-cli-plugins_manager_manager__unix.go | 14 ++++++++++++++
3 files changed, 21 insertions(+)
diffs:
diff --git a/docker-cli/Makefile b/docker-cli/Makefile
index 7e490cab3c..e12b206857 100644
--- a/docker-cli/Makefile
+++ b/docker-cli/Makefile
@@ -14,6 +14,12 @@ LICENSE= apache-2.0
GO_DIST_BASE= cli-${PKGVERSION_NOREV}
GO_SRCPATH= github.com/docker/cli
+SUBST_CLASSES+= paths
+SUBST_STAGE.paths= pre-configure
+SUBST_MESSAGE.paths= Honor plugins under PREFIX
+SUBST_FILES.paths+= cli-plugins/manager/manager_unix.go
+SUBST_VARS.paths+= PREFIX
+
INSTALLATION_DIRS+= bin
INSTALLATION_DIRS+= share/bash-completion/completions
INSTALLATION_DIRS+= share/fish/completions
diff --git a/docker-cli/distinfo b/docker-cli/distinfo
index 4e1aa303f7..55a1d21ac1 100644
--- a/docker-cli/distinfo
+++ b/docker-cli/distinfo
@@ -3,4 +3,5 @@ $NetBSD$
BLAKE2s (docker-cli-20.10.17.tar.gz) = 400a98a6bcfa0671be9d0bf22b0658fde30b048ffffbd61ecd7736bf357ec034
SHA512 (docker-cli-20.10.17.tar.gz) = 9c2cff7e248272e234eac9febdfd7c5c844fc65ee4b08fd4ce0f526e4fed33f2d12682d0991ef28b42977b9de2c84d7ef9c6ddd6f31c4e8c34a3985c1cea3316
Size (docker-cli-20.10.17.tar.gz) = 7636087 bytes
+SHA1 (patch-cli-plugins_manager_manager__unix.go) = 2d17cd8c7dc958e14d23cef6e619c4d798cad5a7
SHA1 (patch-vendor_github.com_docker_docker_pkg_system_rm.go) = b9b220f90afdead624184b4121e25b80d27c4420
diff --git a/docker-cli/patches/patch-cli-plugins_manager_manager__unix.go b/docker-cli/patches/patch-cli-plugins_manager_manager__unix.go
new file mode 100644
index 0000000000..3e659d401c
--- /dev/null
+++ b/docker-cli/patches/patch-cli-plugins_manager_manager__unix.go
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Honors cli plugins under pkgsrc PREFIX.
+
+--- cli-plugins/manager/manager_unix.go.orig 2022-06-06 21:36:39.000000000 +0000
++++ cli-plugins/manager/manager_unix.go
+@@ -4,6 +4,7 @@
+ package manager
+
+ var defaultSystemPluginDirs = []string{
++ "@PREFIX@/lib/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",
+ }
Home |
Main Index |
Thread Index |
Old Index