<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/dd411f84603c453449bf1152497efe334a487123">https://github.com/macports/macports-ports/commit/dd411f84603c453449bf1152497efe334a487123</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit dd411f84603c453449bf1152497efe334a487123
</span>Author: Dan Villiom Podlaski Christiansen <danchr@gmail.com>
AuthorDate: Fri Aug 4 19:23:56 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> docker: update to 24.0.5; adjust plugin path; add notes
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> While at it, adjust description to clarify that this only installs a
</span><span style='display:block; white-space:pre;color:#404040;'> utility, and add a note saying the same so that it's abundantly clear.
</span><span style='display:block; white-space:pre;color:#404040;'> I made both suggest the `colima` port in this case, as it's quite
</span><span style='display:block; white-space:pre;color:#404040;'> helpful in that regard.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/67866
</span>---
devel/docker/Portfile | 26 ++++++++++++++++++++------
devel/docker/files/plugin-path.diff | 11 +++++++++++
2 files changed, 31 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/docker/Portfile b/devel/docker/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0619a53d021..23cf5b55e8e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/docker/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/docker/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
PortGroup golang 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-go.setup github.com/docker/cli 20.10.22 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+go.setup github.com/docker/cli 24.0.5 v
</span> revision 0
name docker
categories devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,16 +11,25 @@ platforms darwin
</span> license Apache-2
maintainers {emcrisostomo @emcrisostomo} \
openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description The open-source application container engine
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Utilities for the open-source application container engine
</span> long_description Docker is an open source project to pack, ship \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- and run any application as a lightweight container.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ and run any application as a lightweight container. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ This port contains command line utilities for interacting \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ with Docker, but not the core daemon.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ee6e3d6c2be1b0d7813aead3f16910982047470c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ee3f35297eace28ba3433b38a33c63a5eea250228e4ab35d1fab5c567ad4f8ab \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7590078
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 1cd95aee22ef0b061fca92a476c9e1dedc401c3a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 57df09957cf2246e86c182c3ae57da1879d2864f7439d7f6ce15fd7a4b962965 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6244654
</span>
build.target github.com/docker/cli/cmd/docker
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles plugin-path.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace s+__PREFIX__+${prefix}+g \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/cli-plugins/manager/manager_unix.go
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> pre-build {
set distfile_dirname [exec tar tzf ${distpath}/[lindex ${distfiles} 0] | sed -n 1p]
set docker_gitcommit [string map "${github.author}-${github.project}- {} / {}" ${distfile_dirname}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,3 +50,8 @@ destroot {
</span> }
github.livecheck.regex {([^"r]+)}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes "\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ This port only contains a utility for working with Docker; to run\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ containers locally, install e.g. the colima port."
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/docker/files/plugin-path.diff b/devel/docker/files/plugin-path.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c3f34080260
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/docker/files/plugin-path.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cli-plugins/manager/manager_unix.go
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cli-plugins/manager/manager_unix.go
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,5 +5,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ var defaultSystemPluginDirs = []string{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "/usr/local/lib/docker/cli-plugins", "/usr/local/libexec/docker/cli-plugins",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "/usr/lib/docker/cli-plugins", "/usr/libexec/docker/cli-plugins",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "__PREFIX__/lib/docker/cli-plugins", "__PREFIX__/libexec/docker/cli-plugins",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Diff finished. Fri Aug 4 19:09:34 2023
</span></pre><pre style='margin:0'>
</pre>