[PR PATCH] docker-compose: update to 2.2.3.

[PR PATCH] docker-compose: update to 2.2.3.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 1234 bytes --]

There is a new pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages docker-compose-2.2.3
https://github.com/void-linux/void-packages/pull/35362

docker-compose: update to 2.2.3.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/35362.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-docker-compose-2.2.3-35362.patch --]
[-- Type: text/x-diff, Size: 2055 bytes --]

From f634e2cb29296eae37b8d6763839317eebbcf68b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 6 Nov 2021 11:19:09 +0100
Subject: [PATCH] docker-compose: update to 2.2.3.

---
 srcpkgs/docker-compose/template | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/docker-compose/template b/srcpkgs/docker-compose/template
index c5867ba38588..4734a06c2689 100644
--- a/srcpkgs/docker-compose/template
+++ b/srcpkgs/docker-compose/template
@@ -1,25 +1,20 @@
 # Template file for 'docker-compose'
 pkgname=docker-compose
-version=1.29.2
-revision=2
+version=2.2.3
+revision=1
 wrksrc="compose-${version}"
-build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-jsonschema python3-docker>=5.0.0
- python3-dockerpty python3-requests python3-docopt python3-yaml
- python3-texttable python3-cached-property python3-paramiko
- python3-dotenv python3-distro"
+build_style=go
+go_import_path="github.com/docker/compose/v2/cmd"
+go_ldflags="-X github.com/docker/compose/v2/internal.Version=v${version}"
+depends="docker-cli"
 short_desc="Tool to define and run multi-container Docker applications"
 maintainer="pancake <pancake@nopcode.org>"
 license="Apache-2.0"
 homepage="https://docs.docker.com/compose/"
-distfiles="https://github.com/docker/compose/archive/${version}.tar.gz"
-checksum=99a9b91d476062d280c889ae4e9993d7dd6a186327bafb2bb39521f9351b96eb
-make_check=no # needs ddt which is not packaged
+distfiles="https://github.com/docker/compose/archive/refs/tags/v${version}.tar.gz"
+checksum=22210187e73732edd9fc02f122ea61481806c703af7b73d0a7351f2e8ed7c0b8
 
 post_install() {
-	vinstall contrib/completion/bash/docker-compose 644 \
-		usr/share/bash-completion/completions docker-compose
-	vinstall contrib/completion/zsh/_docker-compose 644 \
-		usr/share/zsh/site-functions _docker-compose
+	mkdir -p ${DESTDIR}/usr/libexec/docker/cli-plugins
+	mv ${DESTDIR}/usr/bin/cmd ${DESTDIR}/usr/libexec/docker/cli-plugins/docker-compose
 }

Re: [PR PATCH] [Updated] docker-compose: update to 2.2.3.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 1239 bytes --]

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages docker-compose-2.2.3
https://github.com/void-linux/void-packages/pull/35362

docker-compose: update to 2.2.3.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/35362.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-docker-compose-2.2.3-35362.patch --]
[-- Type: text/x-diff, Size: 1989 bytes --]

From 67b2a0c47751ebb6919c8f098df69f99d59b12cc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 4 Feb 2022 22:57:02 +0100
Subject: [PATCH 1/2] New package: docker-cli-compose-2.2.3

---
 srcpkgs/docker-cli-compose/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/docker-cli-compose/template

diff --git a/srcpkgs/docker-cli-compose/template b/srcpkgs/docker-cli-compose/template
new file mode 100644
index 000000000000..9a27f4101ec8
--- /dev/null
+++ b/srcpkgs/docker-cli-compose/template
@@ -0,0 +1,20 @@
+# Template file for 'docker-compose'
+pkgname=docker-compose
+version=2.2.3
+revision=1
+wrksrc="compose-${version}"
+build_style=go
+go_import_path="github.com/docker/compose/v2/cmd"
+go_ldflags="-X github.com/docker/compose/v2/internal.Version=v${version}"
+depends="docker-cli"
+short_desc="Tool to define and run multi-container Docker applications v2"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="Apache-2.0"
+homepage="https://docs.docker.com/compose/"
+distfiles="https://github.com/docker/compose/archive/refs/tags/v${version}.tar.gz"
+checksum=22210187e73732edd9fc02f122ea61481806c703af7b73d0a7351f2e8ed7c0b8
+
+post_install() {
+	mkdir -p ${DESTDIR}/usr/libexec/docker/cli-plugins
+	mv ${DESTDIR}/usr/bin/cmd ${DESTDIR}/usr/libexec/docker/cli-plugins/docker-compose
+}

From 9bf93c4b318f39064a07dcfe35e5a9d913597c03 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 4 Feb 2022 22:59:45 +0100
Subject: [PATCH 2/2] docker-compose: ignore 2.* in update-check

---
 srcpkgs/docker-compose/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/docker-compose/update

diff --git a/srcpkgs/docker-compose/update b/srcpkgs/docker-compose/update
new file mode 100644
index 000000000000..fd57b1a6d8e3
--- /dev/null
+++ b/srcpkgs/docker-compose/update
@@ -0,0 +1 @@
+ignore="2.*" # v2 is not compatible with v1, it's packaged as docker-cli-compose

Re: [PR PATCH] [Updated] docker-compose: update to 2.2.3.

[paper42]

[-- Attachment #1: Type: text/plain, Size: 1239 bytes --]

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages docker-compose-2.2.3
https://github.com/void-linux/void-packages/pull/35362

docker-compose: update to 2.2.3.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/35362.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-docker-compose-2.2.3-35362.patch --]
[-- Type: text/x-diff, Size: 1997 bytes --]

From b4370e008d974472cf60d2bf1976ed7325327794 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 4 Feb 2022 22:57:02 +0100
Subject: [PATCH 1/2] New package: docker-cli-compose-2.2.3

---
 srcpkgs/docker-cli-compose/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/docker-cli-compose/template

diff --git a/srcpkgs/docker-cli-compose/template b/srcpkgs/docker-cli-compose/template
new file mode 100644
index 000000000000..a90c633aadb5
--- /dev/null
+++ b/srcpkgs/docker-cli-compose/template
@@ -0,0 +1,20 @@
+# Template file for 'docker-cli-compose'
+pkgname=docker-cli-compose
+version=2.2.3
+revision=1
+wrksrc="compose-${version}"
+build_style=go
+go_import_path="github.com/docker/compose/v2/cmd"
+go_ldflags="-X github.com/docker/compose/v2/internal.Version=v${version}"
+depends="docker-cli"
+short_desc="Tool to define and run multi-container Docker applications v2"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="Apache-2.0"
+homepage="https://docs.docker.com/compose/"
+distfiles="https://github.com/docker/compose/archive/refs/tags/v${version}.tar.gz"
+checksum=22210187e73732edd9fc02f122ea61481806c703af7b73d0a7351f2e8ed7c0b8
+
+post_install() {
+	mkdir -p ${DESTDIR}/usr/libexec/docker/cli-plugins
+	mv ${DESTDIR}/usr/bin/cmd ${DESTDIR}/usr/libexec/docker/cli-plugins/docker-compose
+}

From 69e6df3c638fe9c2133fa753170407eb24331411 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 4 Feb 2022 22:59:45 +0100
Subject: [PATCH 2/2] docker-compose: ignore 2.* in update-check

---
 srcpkgs/docker-compose/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/docker-compose/update

diff --git a/srcpkgs/docker-compose/update b/srcpkgs/docker-compose/update
new file mode 100644
index 000000000000..fd57b1a6d8e3
--- /dev/null
+++ b/srcpkgs/docker-compose/update
@@ -0,0 +1 @@
+ignore="2.*" # v2 is not compatible with v1, it's packaged as docker-cli-compose

Re: New package: docker-cli-compose-2.2.3

[paper42]

[-- Attachment #1: Type: text/plain, Size: 197 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35362#issuecomment-1030476146

Comment:
This needs more investigation, marking as draft for now

Re: [PR PATCH] [Closed]: New package: docker-cli-compose-2.2.3

[paper42]

[-- Attachment #1: Type: text/plain, Size: 1075 bytes --]

There's a closed pull request on the void-packages repository

New package: docker-cli-compose-2.2.3
https://github.com/void-linux/void-packages/pull/35362

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

Re: New package: docker-cli-compose-2.2.3

[dm17]

[-- Attachment #1: Type: text/plain, Size: 597 bytes --]

New comment by dm17 on void-packages repository

https://github.com/void-linux/void-packages/pull/35362#issuecomment-1035720358

Comment:
Looks like docker compose (aka compose v2) has compose v1 compatibility on Arch (by running the old "docker-compose"), but not on Void. I'm also wondering how
```du -sh /usr/libexec/docker/cli-plugins/docker-compose``` could return 8.6M on Void while ```du -sh /usr/lib/docker/cli-plugins/docker-compose``` could return 31M on Arch. That seems like more of a size difference than the wrapper/helper for backward compatibility could account.
Thanks a bunch!

Re: New package: docker-cli-compose-2.2.3

[paper42]

[-- Attachment #1: Type: text/plain, Size: 979 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35362#issuecomment-1036138831

Comment:
> Looks like docker compose (aka compose v2) has compose v1 compatibility on Arch (by running the old "docker-compose"), but not on Void.

If you look at this PR, it was closed by bf7aa5ba4a7783a9d59c1b7ed9686abf02b26262, I decided to go with just updating the package and not creating a new one. We also have a wrapper.

I'm also wondering how
> ```du -sh /usr/libexec/docker/cli-plugins/docker-compose``` could return 8.6M on Void while ```du -sh /usr/lib/docker/cli-plugins/docker-compose``` could return 31M on Arch. That seems like more of a size difference than the wrapper/helper for backward compatibility could account.

I am not sure how you measured this, I see 21MB on aarch64-musl and 13MB on x86_64. I think it's because of stripping, but I am not sure if the difference is this big and if arch doesn't strip go programs.

Re: New package: docker-cli-compose-2.2.3

[paper42]

[-- Attachment #1: Type: text/plain, Size: 1048 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35362#issuecomment-1036138831

Comment:
> Looks like docker compose (aka compose v2) has compose v1 compatibility on Arch (by running the old "docker-compose"), but not on Void.

If you look at this PR, it was closed by bf7aa5ba4a7783a9d59c1b7ed9686abf02b26262, I decided to go with just updating the package and not creating a new one. We also have a wrapper.

I'm also wondering how
> ```du -sh /usr/libexec/docker/cli-plugins/docker-compose``` could return 8.6M on Void while ```du -sh /usr/lib/docker/cli-plugins/docker-compose``` could return 31M on Arch. That seems like more of a size difference than the wrapper/helper for backward compatibility could account.

I am not sure how you measured this, I see 21MB on aarch64-musl and 13MB on x86_64. I think it's because of stripping, but I am not sure if the difference is this big and if arch doesn't strip go programs.

EDIT: the size reported by ls is actually 25MB, du reports disk usage

Re: New package: docker-cli-compose-2.2.3

[dm17]

[-- Attachment #1: Type: text/plain, Size: 1295 bytes --]

New comment by dm17 on void-packages repository

https://github.com/void-linux/void-packages/pull/35362#issuecomment-1036151596

Comment:
> > Looks like docker compose (aka compose v2) has compose v1 compatibility on Arch (by running the old "docker-compose"), but not on Void.
> 
> If you look at this PR, it was closed by [bf7aa5b](https://github.com/void-linux/void-packages/commit/bf7aa5ba4a7783a9d59c1b7ed9686abf02b26262), I decided to go with just updating the package and not creating a new one. We also have a wrapper.
> 
> I'm also wondering how
> 
> > `du -sh /usr/libexec/docker/cli-plugins/docker-compose` could return 8.6M on Void while `du -sh /usr/lib/docker/cli-plugins/docker-compose` could return 31M on Arch. That seems like more of a size difference than the wrapper/helper for backward compatibility could account.
> 
> I am not sure how you measured this, I see 21MB on aarch64-musl and 13MB on x86_64. I think it's because of stripping, but I am not sure if the difference is this big and if arch doesn't strip go programs.
> 
> EDIT: the size reported by ls is actually 25MB, du reports disk usage

Ah thanks du vs ls shows much less of a difference :)

> We also have a wrapper.

How is this evoked? ```docker-compose disable-v2``` doesn't seem to work.

Re: New package: docker-cli-compose-2.2.3

[paper42]

[-- Attachment #1: Type: text/plain, Size: 404 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/35362#issuecomment-1036202790

Comment:
> > We also have a wrapper.
> 
> How is this evoked? `docker-compose disable-v2` doesn't seem to work.

The wrapper I am talking about is /usr/bin/docker-compose, it should be compatible with v1. disable-v2 is an development command and was probably dropped.

Re: New package: docker-cli-compose-2.2.3

[dm17]

[-- Attachment #1: Type: text/plain, Size: 325 bytes --]

New comment by dm17 on void-packages repository

https://github.com/void-linux/void-packages/pull/35362#issuecomment-1036240031

Comment:
Nice! So both v1 & v2 seem to be working correctly on void now. And I now realize the standard v1 vs v2 differentiation (across distros) is "docker-compose" vs "docker compose" - thanks!