* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2022-03-15 17:24 William Hubbs
0 siblings, 0 replies; 47+ messages in thread
From: William Hubbs @ 2022-03-15 17:24 UTC (permalink / raw
To: gentoo-commits
commit: 32b399df99a600dfc343a1d4ff72c10c2d6d1982
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 15 17:19:37 2022 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 17:24:22 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32b399df
app-containers/docker-compose: add 2.3.3
Closes: https://bugs.gentoo.org/834872
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
app-containers/docker-compose/Manifest | 2 +
.../docker-compose/docker-compose-2.3.3.ebuild | 48 ++++++++++++++++++++++
2 files changed, 50 insertions(+)
diff --git a/app-containers/docker-compose/Manifest b/app-containers/docker-compose/Manifest
index 2a838d0b364f..5b5df6d21fac 100644
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@@ -1 +1,3 @@
DIST docker-compose-1.29.2.tar.gz 320320 BLAKE2B 2d1a6375127fa09661822f7148665161b45bbd234c93444ae31c1d926513fcbc9fb845f8af01d8f11788f24b7517bff5f6cea2a5da9ade897891f2dd728f26bd SHA512 09f2ae2ae7a17ab5fb3e22580f7a80f1a8253f7ad9fc8f29aca432911bcde46ed22030ff3073cdd7eff3d55aaba17f56e628a178ec05c3a9b4f28495d6045111
+DIST docker-compose-2.3.3-deps.tar.xz 486283624 BLAKE2B 1bb2f743ff0ee46e4b5790bc53fadd03ff9cf177c4bd8f28f435eae7f00ceecf475d78cf0a80082066a62c4e97022afaad2b13ac3bb04893914f84b0a756a2b3 SHA512 9ca0dacabe66620108c8017d5ca2bb7fb568b4edb23460d528f81ad9491dd04efb192983a590db965c26781429cba5c6be6eaa91ac51e9a7d8e6ee4adb9b4c09
+DIST docker-compose-2.3.3.tar.gz 270143 BLAKE2B 9ab2863a37402ebcb881797e1d6a170dd9557d14a8174dec4049b55f6f3c106752423ac13d9e2ec1bb95dab83df83e53747519f4ceed91f7d9a5805c630e82e0 SHA512 5986f4f54302fd552c7aeb0cdfbe8d5185744bc2a2fe6f136e1a4009b3b9f68cf7578d3b6a2acb2067ef9a889eb33d159b2daf80140315a29412bda15d2a5446
diff --git a/app-containers/docker-compose/docker-compose-2.3.3.ebuild b/app-containers/docker-compose/docker-compose-2.3.3.ebuild
new file mode 100644
index 000000000000..828aa96d4627
--- /dev/null
+++ b/app-containers/docker-compose/docker-compose-2.3.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2018-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64"
+
+RDEPEND=">=app-containers/docker-20.10.3"
+
+S="${WORKDIR}/compose-${MY_PV}"
+
+src_prepare() {
+ default
+ # do not strip
+ sed -i -e 's/-s -w//' builder.Makefile || die
+}
+
+src_compile() {
+ emake -f builder.Makefile GIT_TAG=v${PV}
+}
+
+src_install() {
+ dodir /usr/libexec/docker/cli-plugins
+ exeinto /usr/libexec/docker/cli-plugins
+ doexe bin/docker-compose
+dodoc README.md
+}
+
+src_test() {
+ emake -f builder.Makefile test
+}
+
+pkg_postinst() {
+ has_version =docker-compose-1.* || return
+ elog
+ elog "docker-compose 2.x is a sub command of docker"
+ elog "Use 'docker compose' from the command line instead of"
+ elog "'docker-compose'"
+}
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2022-03-15 19:24 William Hubbs
0 siblings, 0 replies; 47+ messages in thread
From: William Hubbs @ 2022-03-15 19:24 UTC (permalink / raw
To: gentoo-commits
commit: 7d58734626105af16ea82649eb35ebc7fa9bdd25
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 15 19:22:47 2022 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 19:24:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d587346
app-containers/docker-compose: drop 2.3.3
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
.../docker-compose/docker-compose-2.3.3.ebuild | 48 ----------------------
1 file changed, 48 deletions(-)
diff --git a/app-containers/docker-compose/docker-compose-2.3.3.ebuild b/app-containers/docker-compose/docker-compose-2.3.3.ebuild
deleted file mode 100644
index 828aa96d4627..000000000000
--- a/app-containers/docker-compose/docker-compose-2.3.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2018-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module
-MY_PV=${PV/_/-}
-
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://github.com/docker/compose"
-SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64"
-
-RDEPEND=">=app-containers/docker-20.10.3"
-
-S="${WORKDIR}/compose-${MY_PV}"
-
-src_prepare() {
- default
- # do not strip
- sed -i -e 's/-s -w//' builder.Makefile || die
-}
-
-src_compile() {
- emake -f builder.Makefile GIT_TAG=v${PV}
-}
-
-src_install() {
- dodir /usr/libexec/docker/cli-plugins
- exeinto /usr/libexec/docker/cli-plugins
- doexe bin/docker-compose
-dodoc README.md
-}
-
-src_test() {
- emake -f builder.Makefile test
-}
-
-pkg_postinst() {
- has_version =docker-compose-1.* || return
- elog
- elog "docker-compose 2.x is a sub command of docker"
- elog "Use 'docker compose' from the command line instead of"
- elog "'docker-compose'"
-}
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2022-03-15 19:24 William Hubbs
0 siblings, 0 replies; 47+ messages in thread
From: William Hubbs @ 2022-03-15 19:24 UTC (permalink / raw
To: gentoo-commits
commit: 81ad958f54e2d7183b4908fea8c36202f5da8d6a
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 15 19:21:04 2022 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 19:24:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81ad958f
app-containers/docker-compose: add 2.3.3-r1
- rdepend on docker-cli instead of docker
- fix the failure in pkg_postinst
Closes: https://bugs.gentoo.org/835366
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
.../docker-compose/docker-compose-2.3.3-r1.ebuild | 48 ++++++++++++++++++++++
1 file changed, 48 insertions(+)
diff --git a/app-containers/docker-compose/docker-compose-2.3.3-r1.ebuild b/app-containers/docker-compose/docker-compose-2.3.3-r1.ebuild
new file mode 100644
index 000000000000..b6d6d3326e38
--- /dev/null
+++ b/app-containers/docker-compose/docker-compose-2.3.3-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2018-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64"
+
+RDEPEND=">=app-containers/docker-cli-20.10.3"
+
+S="${WORKDIR}/compose-${MY_PV}"
+
+src_prepare() {
+ default
+ # do not strip
+ sed -i -e 's/-s -w//' builder.Makefile || die
+}
+
+src_compile() {
+ emake -f builder.Makefile GIT_TAG=v${PV}
+}
+
+src_install() {
+ dodir /usr/libexec/docker/cli-plugins
+ exeinto /usr/libexec/docker/cli-plugins
+ doexe bin/docker-compose
+dodoc README.md
+}
+
+src_test() {
+ emake -f builder.Makefile test
+}
+
+pkg_postinst() {
+ has_version =app-containers/docker-compose-1* || return
+ elog
+ elog "docker-compose 2.x is a sub command of docker"
+ elog "Use 'docker compose' from the command line instead of"
+ elog "'docker-compose'"
+}
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2022-03-16 13:25 Sebastian Pipping
0 siblings, 0 replies; 47+ messages in thread
From: Sebastian Pipping @ 2022-03-16 13:25 UTC (permalink / raw
To: gentoo-commits
commit: f2290d75a593397ba2fab81d2ae79774b58d7674
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 16 13:22:17 2022 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 13:25:11 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2290d75
app-containers/docker-compose: Clarify maintainership (1.x.x versus 2.x.x)
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-3.0.30, Repoman-3.0.3
app-containers/docker-compose/metadata.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/app-containers/docker-compose/metadata.xml b/app-containers/docker-compose/metadata.xml
index 790ae6322fc5..cf47ba4d85b4 100644
--- a/app-containers/docker-compose/metadata.xml
+++ b/app-containers/docker-compose/metadata.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>sping@gentoo.org</email>
- <name>Sebastian Pipping</name>
- </maintainer>
- <maintainer type="person">
+ <maintainer type="person"><!-- for 2.x.x (Golang) -->
<email>williamh@gentoo.org</email>
<name>William Hubbs</name>
</maintainer>
+ <maintainer type="person"><!-- for 1.x.x (Python) -->
+ <email>sping@gentoo.org</email>
+ <name>Sebastian Pipping</name>
+ </maintainer>
<upstream>
<remote-id type="pypi">docker-compose</remote-id>
<remote-id type="github">docker/compose</remote-id>
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2022-03-17 21:39 William Hubbs
0 siblings, 0 replies; 47+ messages in thread
From: William Hubbs @ 2022-03-17 21:39 UTC (permalink / raw
To: gentoo-commits
commit: bd5c6fbc314173acd2a19373c01e30f3fa67f416
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 17 21:39:19 2022 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Mar 17 21:39:19 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd5c6fbc
app-containers/docker-compose: add 2.3.3-r2
This makes the messages about the new command and depclean more
prominent.
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
.../docker-compose/docker-compose-2.3.3-r2.ebuild | 51 ++++++++++++++++++++++
1 file changed, 51 insertions(+)
diff --git a/app-containers/docker-compose/docker-compose-2.3.3-r2.ebuild b/app-containers/docker-compose/docker-compose-2.3.3-r2.ebuild
new file mode 100644
index 000000000000..945d4b1b24b1
--- /dev/null
+++ b/app-containers/docker-compose/docker-compose-2.3.3-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2018-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64"
+
+RDEPEND=">=app-containers/docker-cli-20.10.3"
+
+S="${WORKDIR}/compose-${MY_PV}"
+
+src_prepare() {
+ default
+ # do not strip
+ sed -i -e 's/-s -w//' builder.Makefile || die
+}
+
+src_compile() {
+ emake -f builder.Makefile GIT_TAG=v${PV}
+}
+
+src_install() {
+ dodir /usr/libexec/docker/cli-plugins
+ exeinto /usr/libexec/docker/cli-plugins
+ doexe bin/docker-compose
+dodoc README.md
+}
+
+src_test() {
+ emake -f builder.Makefile test
+}
+
+pkg_postinst() {
+ has_version =app-containers/docker-compose-1* || return
+ ewarn
+ ewarn "docker-compose 2.x is a sub command of docker"
+ ewarn "Use 'docker compose' from the command line instead of"
+ ewarn "'docker-compose'"
+ ewarn "If you need to keep 1.x around, please run the following"
+ ewarn "command before your next --depclean"
+ ewarn "# emerge --noreplace docker-compose:0"
+}
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2022-03-17 21:39 William Hubbs
0 siblings, 0 replies; 47+ messages in thread
From: William Hubbs @ 2022-03-17 21:39 UTC (permalink / raw
To: gentoo-commits
commit: e682114a1721d28cfa319444da56a0b1a0f2384b
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 17 21:39:20 2022 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Mar 17 21:39:20 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e682114a
app-containers/docker-compose: drop 2.3.3-r1
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
.../docker-compose/docker-compose-2.3.3-r1.ebuild | 48 ----------------------
1 file changed, 48 deletions(-)
diff --git a/app-containers/docker-compose/docker-compose-2.3.3-r1.ebuild b/app-containers/docker-compose/docker-compose-2.3.3-r1.ebuild
deleted file mode 100644
index b6d6d3326e38..000000000000
--- a/app-containers/docker-compose/docker-compose-2.3.3-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2018-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module
-MY_PV=${PV/_/-}
-
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://github.com/docker/compose"
-SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64"
-
-RDEPEND=">=app-containers/docker-cli-20.10.3"
-
-S="${WORKDIR}/compose-${MY_PV}"
-
-src_prepare() {
- default
- # do not strip
- sed -i -e 's/-s -w//' builder.Makefile || die
-}
-
-src_compile() {
- emake -f builder.Makefile GIT_TAG=v${PV}
-}
-
-src_install() {
- dodir /usr/libexec/docker/cli-plugins
- exeinto /usr/libexec/docker/cli-plugins
- doexe bin/docker-compose
-dodoc README.md
-}
-
-src_test() {
- emake -f builder.Makefile test
-}
-
-pkg_postinst() {
- has_version =app-containers/docker-compose-1* || return
- elog
- elog "docker-compose 2.x is a sub command of docker"
- elog "Use 'docker compose' from the command line instead of"
- elog "'docker-compose'"
-}
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2022-03-26 1:37 Sam James
0 siblings, 0 replies; 47+ messages in thread
From: Sam James @ 2022-03-26 1:37 UTC (permalink / raw
To: gentoo-commits
commit: 960582210d1df818f3ae87832f5873fad6fdbc17
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 01:34:25 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 01:37:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96058221
app-containers/docker-compose: fix RedundantDodir; phase order
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-containers/docker-compose/docker-compose-2.3.3-r2.ebuild | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/app-containers/docker-compose/docker-compose-2.3.3-r2.ebuild b/app-containers/docker-compose/docker-compose-2.3.3-r2.ebuild
index 945d4b1b24b1..5aeed5bc81a3 100644
--- a/app-containers/docker-compose/docker-compose-2.3.3-r2.ebuild
+++ b/app-containers/docker-compose/docker-compose-2.3.3-r2.ebuild
@@ -28,15 +28,14 @@ src_compile() {
emake -f builder.Makefile GIT_TAG=v${PV}
}
+src_test() {
+ emake -f builder.Makefile test
+}
+
src_install() {
- dodir /usr/libexec/docker/cli-plugins
exeinto /usr/libexec/docker/cli-plugins
doexe bin/docker-compose
-dodoc README.md
-}
-
-src_test() {
- emake -f builder.Makefile test
+ dodoc README.md
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2022-03-26 17:07 Arthur Zamarin
0 siblings, 0 replies; 47+ messages in thread
From: Arthur Zamarin @ 2022-03-26 17:07 UTC (permalink / raw
To: gentoo-commits
commit: 69713bdddb989739673ae4012a5d23c833c858cc
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 17:06:52 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 17:06:52 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69713bdd
app-containers/docker-compose: Keyword 2.3.3-r2 arm64, #836020
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
app-containers/docker-compose/docker-compose-2.3.3-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-containers/docker-compose/docker-compose-2.3.3-r2.ebuild b/app-containers/docker-compose/docker-compose-2.3.3-r2.ebuild
index 5aeed5bc81a3..3946a436a4be 100644
--- a/app-containers/docker-compose/docker-compose-2.3.3-r2.ebuild
+++ b/app-containers/docker-compose/docker-compose-2.3.3-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
RDEPEND=">=app-containers/docker-cli-20.10.3"
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2022-04-10 19:01 William Hubbs
0 siblings, 0 replies; 47+ messages in thread
From: William Hubbs @ 2022-04-10 19:01 UTC (permalink / raw
To: gentoo-commits
commit: 147e4b863972f25d6e2537a728a4bbc295fea6ac
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 19:00:24 2022 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 19:00:44 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=147e4b86
app-containers/docker-compose: add 2.4.1
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
app-containers/docker-compose/Manifest | 2 +
.../docker-compose/docker-compose-2.4.1.ebuild | 50 ++++++++++++++++++++++
2 files changed, 52 insertions(+)
diff --git a/app-containers/docker-compose/Manifest b/app-containers/docker-compose/Manifest
index 5b5df6d21fac..ac2ffc961d31 100644
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@@ -1,3 +1,5 @@
DIST docker-compose-1.29.2.tar.gz 320320 BLAKE2B 2d1a6375127fa09661822f7148665161b45bbd234c93444ae31c1d926513fcbc9fb845f8af01d8f11788f24b7517bff5f6cea2a5da9ade897891f2dd728f26bd SHA512 09f2ae2ae7a17ab5fb3e22580f7a80f1a8253f7ad9fc8f29aca432911bcde46ed22030ff3073cdd7eff3d55aaba17f56e628a178ec05c3a9b4f28495d6045111
DIST docker-compose-2.3.3-deps.tar.xz 486283624 BLAKE2B 1bb2f743ff0ee46e4b5790bc53fadd03ff9cf177c4bd8f28f435eae7f00ceecf475d78cf0a80082066a62c4e97022afaad2b13ac3bb04893914f84b0a756a2b3 SHA512 9ca0dacabe66620108c8017d5ca2bb7fb568b4edb23460d528f81ad9491dd04efb192983a590db965c26781429cba5c6be6eaa91ac51e9a7d8e6ee4adb9b4c09
DIST docker-compose-2.3.3.tar.gz 270143 BLAKE2B 9ab2863a37402ebcb881797e1d6a170dd9557d14a8174dec4049b55f6f3c106752423ac13d9e2ec1bb95dab83df83e53747519f4ceed91f7d9a5805c630e82e0 SHA512 5986f4f54302fd552c7aeb0cdfbe8d5185744bc2a2fe6f136e1a4009b3b9f68cf7578d3b6a2acb2067ef9a889eb33d159b2daf80140315a29412bda15d2a5446
+DIST docker-compose-2.4.1-deps.tar.xz 110605892 BLAKE2B 042d84818b963c23769e039a930076355cb2ebb2d86c5f8af56f240689012ae7aeff12cf366b46f2bf0fa0799d5f7b825f726686f54db218787e91a6c308ba5f SHA512 28bb292daac3ddf1055c4dd5f0b1920dc8145636e878beaac90863fec8b86e277f6906d82753b62fc7c9f755a9246c223307fad5fb412e41c0ca11b4d60e7e0e
+DIST docker-compose-2.4.1.tar.gz 274404 BLAKE2B 346c9c527630217fdeada28e7329400a910007c5296cf4b8b7f41d90049c51c54c518f82f602b71332d9ecd91eeb65e1135aa18c37fe98ee02b99238cf7dbadb SHA512 0c7611c95955b63a4cc77a4498393c52c7107a4a6fe950dbf2d1181df8f44f682337eb6cc7814e9902551b230507b12a05d1377acac7b2342f829401f1d24651
diff --git a/app-containers/docker-compose/docker-compose-2.4.1.ebuild b/app-containers/docker-compose/docker-compose-2.4.1.ebuild
new file mode 100644
index 000000000000..3946a436a4be
--- /dev/null
+++ b/app-containers/docker-compose/docker-compose-2.4.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2018-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND=">=app-containers/docker-cli-20.10.3"
+
+S="${WORKDIR}/compose-${MY_PV}"
+
+src_prepare() {
+ default
+ # do not strip
+ sed -i -e 's/-s -w//' builder.Makefile || die
+}
+
+src_compile() {
+ emake -f builder.Makefile GIT_TAG=v${PV}
+}
+
+src_test() {
+ emake -f builder.Makefile test
+}
+
+src_install() {
+ exeinto /usr/libexec/docker/cli-plugins
+ doexe bin/docker-compose
+ dodoc README.md
+}
+
+pkg_postinst() {
+ has_version =app-containers/docker-compose-1* || return
+ ewarn
+ ewarn "docker-compose 2.x is a sub command of docker"
+ ewarn "Use 'docker compose' from the command line instead of"
+ ewarn "'docker-compose'"
+ ewarn "If you need to keep 1.x around, please run the following"
+ ewarn "command before your next --depclean"
+ ewarn "# emerge --noreplace docker-compose:0"
+}
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2022-05-02 15:23 William Hubbs
0 siblings, 0 replies; 47+ messages in thread
From: William Hubbs @ 2022-05-02 15:23 UTC (permalink / raw
To: gentoo-commits
commit: de2a923cf53eb8047145c12ce3469c3c4029cc30
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon May 2 15:22:44 2022 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon May 2 15:23:09 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de2a923c
app-containers/docker-compose: add 2.5.0
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
app-containers/docker-compose/Manifest | 2 +
.../docker-compose/docker-compose-2.5.0.ebuild | 50 ++++++++++++++++++++++
2 files changed, 52 insertions(+)
diff --git a/app-containers/docker-compose/Manifest b/app-containers/docker-compose/Manifest
index ac2ffc961d31..bc670141e55e 100644
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@@ -3,3 +3,5 @@ DIST docker-compose-2.3.3-deps.tar.xz 486283624 BLAKE2B 1bb2f743ff0ee46e4b5790bc
DIST docker-compose-2.3.3.tar.gz 270143 BLAKE2B 9ab2863a37402ebcb881797e1d6a170dd9557d14a8174dec4049b55f6f3c106752423ac13d9e2ec1bb95dab83df83e53747519f4ceed91f7d9a5805c630e82e0 SHA512 5986f4f54302fd552c7aeb0cdfbe8d5185744bc2a2fe6f136e1a4009b3b9f68cf7578d3b6a2acb2067ef9a889eb33d159b2daf80140315a29412bda15d2a5446
DIST docker-compose-2.4.1-deps.tar.xz 110605892 BLAKE2B 042d84818b963c23769e039a930076355cb2ebb2d86c5f8af56f240689012ae7aeff12cf366b46f2bf0fa0799d5f7b825f726686f54db218787e91a6c308ba5f SHA512 28bb292daac3ddf1055c4dd5f0b1920dc8145636e878beaac90863fec8b86e277f6906d82753b62fc7c9f755a9246c223307fad5fb412e41c0ca11b4d60e7e0e
DIST docker-compose-2.4.1.tar.gz 274404 BLAKE2B 346c9c527630217fdeada28e7329400a910007c5296cf4b8b7f41d90049c51c54c518f82f602b71332d9ecd91eeb65e1135aa18c37fe98ee02b99238cf7dbadb SHA512 0c7611c95955b63a4cc77a4498393c52c7107a4a6fe950dbf2d1181df8f44f682337eb6cc7814e9902551b230507b12a05d1377acac7b2342f829401f1d24651
+DIST docker-compose-2.5.0-deps.tar.xz 110626568 BLAKE2B 657d4d421172a6ba3516475045af50ef2351cc847933a799b7232ad6a46485d7961ad5875c9f19bf96d39adf275ca943d02fba2b939a210c080c6d38211e56f5 SHA512 231416474c6b3f73911bc7cf344ea5bfdb719cecf6ad7b159c755814df08ffcb60d05ccbdd294211cb7f64a52a5a81e2dfd357bdc10738918d47a75909d20bf9
+DIST docker-compose-2.5.0.tar.gz 274812 BLAKE2B cf3b49cc13a8ab37d6426e78f4d9fca9a7b629346d292458e32ca2b66d20ba49929cc354d570b05deec3a0e0ac7778a02045ea87070059fc20c352f2d2ddb589 SHA512 7b556394e58dcdd49229c608d0672fe1aa5bd0b715f49b4b3e2ecbea16cc4962deb7e816ea057a8a565c598c21207316b8f7b5e41f0af0c3f330054ae81c2703
diff --git a/app-containers/docker-compose/docker-compose-2.5.0.ebuild b/app-containers/docker-compose/docker-compose-2.5.0.ebuild
new file mode 100644
index 000000000000..3946a436a4be
--- /dev/null
+++ b/app-containers/docker-compose/docker-compose-2.5.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2018-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND=">=app-containers/docker-cli-20.10.3"
+
+S="${WORKDIR}/compose-${MY_PV}"
+
+src_prepare() {
+ default
+ # do not strip
+ sed -i -e 's/-s -w//' builder.Makefile || die
+}
+
+src_compile() {
+ emake -f builder.Makefile GIT_TAG=v${PV}
+}
+
+src_test() {
+ emake -f builder.Makefile test
+}
+
+src_install() {
+ exeinto /usr/libexec/docker/cli-plugins
+ doexe bin/docker-compose
+ dodoc README.md
+}
+
+pkg_postinst() {
+ has_version =app-containers/docker-compose-1* || return
+ ewarn
+ ewarn "docker-compose 2.x is a sub command of docker"
+ ewarn "Use 'docker compose' from the command line instead of"
+ ewarn "'docker-compose'"
+ ewarn "If you need to keep 1.x around, please run the following"
+ ewarn "command before your next --depclean"
+ ewarn "# emerge --noreplace docker-compose:0"
+}
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2022-06-03 17:13 William Hubbs
0 siblings, 0 replies; 47+ messages in thread
From: William Hubbs @ 2022-06-03 17:13 UTC (permalink / raw
To: gentoo-commits
commit: 18181f0a64ff79d81567c87e2b2351294a7e705e
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 3 17:13:21 2022 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Jun 3 17:13:21 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18181f0a
app-containers/docker-compose: add 2.6.0
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
app-containers/docker-compose/Manifest | 2 +
.../docker-compose/docker-compose-2.6.0.ebuild | 50 ++++++++++++++++++++++
2 files changed, 52 insertions(+)
diff --git a/app-containers/docker-compose/Manifest b/app-containers/docker-compose/Manifest
index bc670141e55e..2db1874c90f1 100644
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@@ -5,3 +5,5 @@ DIST docker-compose-2.4.1-deps.tar.xz 110605892 BLAKE2B 042d84818b963c23769e039a
DIST docker-compose-2.4.1.tar.gz 274404 BLAKE2B 346c9c527630217fdeada28e7329400a910007c5296cf4b8b7f41d90049c51c54c518f82f602b71332d9ecd91eeb65e1135aa18c37fe98ee02b99238cf7dbadb SHA512 0c7611c95955b63a4cc77a4498393c52c7107a4a6fe950dbf2d1181df8f44f682337eb6cc7814e9902551b230507b12a05d1377acac7b2342f829401f1d24651
DIST docker-compose-2.5.0-deps.tar.xz 110626568 BLAKE2B 657d4d421172a6ba3516475045af50ef2351cc847933a799b7232ad6a46485d7961ad5875c9f19bf96d39adf275ca943d02fba2b939a210c080c6d38211e56f5 SHA512 231416474c6b3f73911bc7cf344ea5bfdb719cecf6ad7b159c755814df08ffcb60d05ccbdd294211cb7f64a52a5a81e2dfd357bdc10738918d47a75909d20bf9
DIST docker-compose-2.5.0.tar.gz 274812 BLAKE2B cf3b49cc13a8ab37d6426e78f4d9fca9a7b629346d292458e32ca2b66d20ba49929cc354d570b05deec3a0e0ac7778a02045ea87070059fc20c352f2d2ddb589 SHA512 7b556394e58dcdd49229c608d0672fe1aa5bd0b715f49b4b3e2ecbea16cc4962deb7e816ea057a8a565c598c21207316b8f7b5e41f0af0c3f330054ae81c2703
+DIST docker-compose-2.6.0-deps.tar.xz 110634424 BLAKE2B a63f67babac39bb3cc01cdf1a6db24d6612f0d1e9d41eb4d60e83153f3acc5f096cc323a28cba8ae7ff0e43c18b10427cf80a235e8d3463827487d479ef0db3e SHA512 d3001fda9da5523594d684db4f12c85c41a4b6e64d7f97b774d0d3ce68c7c301d466f7a4e2a1c9e17b23fca124b6fc253746255919b5212f7bb6d72d3bed85e5
+DIST docker-compose-2.6.0.tar.gz 277387 BLAKE2B e4ca8d614a8ae860dcda77e3b655ff6a8f4af8b4c77e679cdfe256053ac6b0bbbf77a92f2ca871a6d95120c2bbb54093979f816be3c367ff59e355e57fe063d8 SHA512 df8402f0f827b7c1defbb7d0b5037ea38db98337d8ebc4756f0316cf55e368e6c61401fb0d000e1942e0878d5ce1870b0f2a3217ac4b34d1e5f4c3aab68832fe
diff --git a/app-containers/docker-compose/docker-compose-2.6.0.ebuild b/app-containers/docker-compose/docker-compose-2.6.0.ebuild
new file mode 100644
index 000000000000..3946a436a4be
--- /dev/null
+++ b/app-containers/docker-compose/docker-compose-2.6.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2018-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND=">=app-containers/docker-cli-20.10.3"
+
+S="${WORKDIR}/compose-${MY_PV}"
+
+src_prepare() {
+ default
+ # do not strip
+ sed -i -e 's/-s -w//' builder.Makefile || die
+}
+
+src_compile() {
+ emake -f builder.Makefile GIT_TAG=v${PV}
+}
+
+src_test() {
+ emake -f builder.Makefile test
+}
+
+src_install() {
+ exeinto /usr/libexec/docker/cli-plugins
+ doexe bin/docker-compose
+ dodoc README.md
+}
+
+pkg_postinst() {
+ has_version =app-containers/docker-compose-1* || return
+ ewarn
+ ewarn "docker-compose 2.x is a sub command of docker"
+ ewarn "Use 'docker compose' from the command line instead of"
+ ewarn "'docker-compose'"
+ ewarn "If you need to keep 1.x around, please run the following"
+ ewarn "command before your next --depclean"
+ ewarn "# emerge --noreplace docker-compose:0"
+}
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2022-06-13 20:27 William Hubbs
0 siblings, 0 replies; 47+ messages in thread
From: William Hubbs @ 2022-06-13 20:27 UTC (permalink / raw
To: gentoo-commits
commit: a4baab66b1225bd88586221ccc61d63caba85b88
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 13 20:20:54 2022 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Jun 13 20:20:54 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4baab66
app-containers/docker-compose: drop 2.3.3-r2, 2.4.1
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
app-containers/docker-compose/Manifest | 4 --
.../docker-compose/docker-compose-2.3.3-r2.ebuild | 50 ----------------------
.../docker-compose/docker-compose-2.4.1.ebuild | 50 ----------------------
3 files changed, 104 deletions(-)
diff --git a/app-containers/docker-compose/Manifest b/app-containers/docker-compose/Manifest
index 2db1874c90f1..48d6702bebf5 100644
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@@ -1,8 +1,4 @@
DIST docker-compose-1.29.2.tar.gz 320320 BLAKE2B 2d1a6375127fa09661822f7148665161b45bbd234c93444ae31c1d926513fcbc9fb845f8af01d8f11788f24b7517bff5f6cea2a5da9ade897891f2dd728f26bd SHA512 09f2ae2ae7a17ab5fb3e22580f7a80f1a8253f7ad9fc8f29aca432911bcde46ed22030ff3073cdd7eff3d55aaba17f56e628a178ec05c3a9b4f28495d6045111
-DIST docker-compose-2.3.3-deps.tar.xz 486283624 BLAKE2B 1bb2f743ff0ee46e4b5790bc53fadd03ff9cf177c4bd8f28f435eae7f00ceecf475d78cf0a80082066a62c4e97022afaad2b13ac3bb04893914f84b0a756a2b3 SHA512 9ca0dacabe66620108c8017d5ca2bb7fb568b4edb23460d528f81ad9491dd04efb192983a590db965c26781429cba5c6be6eaa91ac51e9a7d8e6ee4adb9b4c09
-DIST docker-compose-2.3.3.tar.gz 270143 BLAKE2B 9ab2863a37402ebcb881797e1d6a170dd9557d14a8174dec4049b55f6f3c106752423ac13d9e2ec1bb95dab83df83e53747519f4ceed91f7d9a5805c630e82e0 SHA512 5986f4f54302fd552c7aeb0cdfbe8d5185744bc2a2fe6f136e1a4009b3b9f68cf7578d3b6a2acb2067ef9a889eb33d159b2daf80140315a29412bda15d2a5446
-DIST docker-compose-2.4.1-deps.tar.xz 110605892 BLAKE2B 042d84818b963c23769e039a930076355cb2ebb2d86c5f8af56f240689012ae7aeff12cf366b46f2bf0fa0799d5f7b825f726686f54db218787e91a6c308ba5f SHA512 28bb292daac3ddf1055c4dd5f0b1920dc8145636e878beaac90863fec8b86e277f6906d82753b62fc7c9f755a9246c223307fad5fb412e41c0ca11b4d60e7e0e
-DIST docker-compose-2.4.1.tar.gz 274404 BLAKE2B 346c9c527630217fdeada28e7329400a910007c5296cf4b8b7f41d90049c51c54c518f82f602b71332d9ecd91eeb65e1135aa18c37fe98ee02b99238cf7dbadb SHA512 0c7611c95955b63a4cc77a4498393c52c7107a4a6fe950dbf2d1181df8f44f682337eb6cc7814e9902551b230507b12a05d1377acac7b2342f829401f1d24651
DIST docker-compose-2.5.0-deps.tar.xz 110626568 BLAKE2B 657d4d421172a6ba3516475045af50ef2351cc847933a799b7232ad6a46485d7961ad5875c9f19bf96d39adf275ca943d02fba2b939a210c080c6d38211e56f5 SHA512 231416474c6b3f73911bc7cf344ea5bfdb719cecf6ad7b159c755814df08ffcb60d05ccbdd294211cb7f64a52a5a81e2dfd357bdc10738918d47a75909d20bf9
DIST docker-compose-2.5.0.tar.gz 274812 BLAKE2B cf3b49cc13a8ab37d6426e78f4d9fca9a7b629346d292458e32ca2b66d20ba49929cc354d570b05deec3a0e0ac7778a02045ea87070059fc20c352f2d2ddb589 SHA512 7b556394e58dcdd49229c608d0672fe1aa5bd0b715f49b4b3e2ecbea16cc4962deb7e816ea057a8a565c598c21207316b8f7b5e41f0af0c3f330054ae81c2703
DIST docker-compose-2.6.0-deps.tar.xz 110634424 BLAKE2B a63f67babac39bb3cc01cdf1a6db24d6612f0d1e9d41eb4d60e83153f3acc5f096cc323a28cba8ae7ff0e43c18b10427cf80a235e8d3463827487d479ef0db3e SHA512 d3001fda9da5523594d684db4f12c85c41a4b6e64d7f97b774d0d3ce68c7c301d466f7a4e2a1c9e17b23fca124b6fc253746255919b5212f7bb6d72d3bed85e5
diff --git a/app-containers/docker-compose/docker-compose-2.3.3-r2.ebuild b/app-containers/docker-compose/docker-compose-2.3.3-r2.ebuild
deleted file mode 100644
index 3946a436a4be..000000000000
--- a/app-containers/docker-compose/docker-compose-2.3.3-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2018-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module
-MY_PV=${PV/_/-}
-
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://github.com/docker/compose"
-SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND=">=app-containers/docker-cli-20.10.3"
-
-S="${WORKDIR}/compose-${MY_PV}"
-
-src_prepare() {
- default
- # do not strip
- sed -i -e 's/-s -w//' builder.Makefile || die
-}
-
-src_compile() {
- emake -f builder.Makefile GIT_TAG=v${PV}
-}
-
-src_test() {
- emake -f builder.Makefile test
-}
-
-src_install() {
- exeinto /usr/libexec/docker/cli-plugins
- doexe bin/docker-compose
- dodoc README.md
-}
-
-pkg_postinst() {
- has_version =app-containers/docker-compose-1* || return
- ewarn
- ewarn "docker-compose 2.x is a sub command of docker"
- ewarn "Use 'docker compose' from the command line instead of"
- ewarn "'docker-compose'"
- ewarn "If you need to keep 1.x around, please run the following"
- ewarn "command before your next --depclean"
- ewarn "# emerge --noreplace docker-compose:0"
-}
diff --git a/app-containers/docker-compose/docker-compose-2.4.1.ebuild b/app-containers/docker-compose/docker-compose-2.4.1.ebuild
deleted file mode 100644
index 3946a436a4be..000000000000
--- a/app-containers/docker-compose/docker-compose-2.4.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2018-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module
-MY_PV=${PV/_/-}
-
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://github.com/docker/compose"
-SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND=">=app-containers/docker-cli-20.10.3"
-
-S="${WORKDIR}/compose-${MY_PV}"
-
-src_prepare() {
- default
- # do not strip
- sed -i -e 's/-s -w//' builder.Makefile || die
-}
-
-src_compile() {
- emake -f builder.Makefile GIT_TAG=v${PV}
-}
-
-src_test() {
- emake -f builder.Makefile test
-}
-
-src_install() {
- exeinto /usr/libexec/docker/cli-plugins
- doexe bin/docker-compose
- dodoc README.md
-}
-
-pkg_postinst() {
- has_version =app-containers/docker-compose-1* || return
- ewarn
- ewarn "docker-compose 2.x is a sub command of docker"
- ewarn "Use 'docker compose' from the command line instead of"
- ewarn "'docker-compose'"
- ewarn "If you need to keep 1.x around, please run the following"
- ewarn "command before your next --depclean"
- ewarn "# emerge --noreplace docker-compose:0"
-}
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2022-09-29 15:35 William Hubbs
0 siblings, 0 replies; 47+ messages in thread
From: William Hubbs @ 2022-09-29 15:35 UTC (permalink / raw
To: gentoo-commits
commit: e1195753f7286deb6e7ad0144ae0e967a4aa12b8
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 29 15:34:22 2022 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Sep 29 15:34:36 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1195753
app-containers/docker-compose: add 2.11.2
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
app-containers/docker-compose/Manifest | 2 +
.../docker-compose/docker-compose-2.11.2.ebuild | 50 ++++++++++++++++++++++
2 files changed, 52 insertions(+)
diff --git a/app-containers/docker-compose/Manifest b/app-containers/docker-compose/Manifest
index 48d6702bebf5..12180ede71c1 100644
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@@ -1,4 +1,6 @@
DIST docker-compose-1.29.2.tar.gz 320320 BLAKE2B 2d1a6375127fa09661822f7148665161b45bbd234c93444ae31c1d926513fcbc9fb845f8af01d8f11788f24b7517bff5f6cea2a5da9ade897891f2dd728f26bd SHA512 09f2ae2ae7a17ab5fb3e22580f7a80f1a8253f7ad9fc8f29aca432911bcde46ed22030ff3073cdd7eff3d55aaba17f56e628a178ec05c3a9b4f28495d6045111
+DIST docker-compose-2.11.2-deps.tar.xz 122617800 BLAKE2B 47fe7f6e1f0321498a4b0a060ea88758355be6ecd9b7798e3f614a62c93c5508dea744ab0437626c94d33ecee91f4d9e9ede0a4f26754ae96cc070b9e3377af5 SHA512 3f36191b35bb17d02d0c85ba64a2d79f6128f2d3ac1d1921ff348f165bbc92a91e92c20374159b6e7ed140a0a08f698473f0da35dd2e140ad3675c8eddc9fda3
+DIST docker-compose-2.11.2.tar.gz 303314 BLAKE2B e395a820f0ef414021427ae01d390e30c8d6287c12b2b72c7e08f88219580370185bc48dbf31a30548c7b6f0ce0f070faa488d29689fbcd0d14af2b4fa2e4a67 SHA512 174ef8e38dce65f6ce117f8efdd24049dd9e56aa7c619242b4514ba258461ec1d65b2d226601a6efb3caf7b8516ba5c65af48854f70a2eff25adcdd3f9b9f697
DIST docker-compose-2.5.0-deps.tar.xz 110626568 BLAKE2B 657d4d421172a6ba3516475045af50ef2351cc847933a799b7232ad6a46485d7961ad5875c9f19bf96d39adf275ca943d02fba2b939a210c080c6d38211e56f5 SHA512 231416474c6b3f73911bc7cf344ea5bfdb719cecf6ad7b159c755814df08ffcb60d05ccbdd294211cb7f64a52a5a81e2dfd357bdc10738918d47a75909d20bf9
DIST docker-compose-2.5.0.tar.gz 274812 BLAKE2B cf3b49cc13a8ab37d6426e78f4d9fca9a7b629346d292458e32ca2b66d20ba49929cc354d570b05deec3a0e0ac7778a02045ea87070059fc20c352f2d2ddb589 SHA512 7b556394e58dcdd49229c608d0672fe1aa5bd0b715f49b4b3e2ecbea16cc4962deb7e816ea057a8a565c598c21207316b8f7b5e41f0af0c3f330054ae81c2703
DIST docker-compose-2.6.0-deps.tar.xz 110634424 BLAKE2B a63f67babac39bb3cc01cdf1a6db24d6612f0d1e9d41eb4d60e83153f3acc5f096cc323a28cba8ae7ff0e43c18b10427cf80a235e8d3463827487d479ef0db3e SHA512 d3001fda9da5523594d684db4f12c85c41a4b6e64d7f97b774d0d3ce68c7c301d466f7a4e2a1c9e17b23fca124b6fc253746255919b5212f7bb6d72d3bed85e5
diff --git a/app-containers/docker-compose/docker-compose-2.11.2.ebuild b/app-containers/docker-compose/docker-compose-2.11.2.ebuild
new file mode 100644
index 000000000000..26e531c4ce68
--- /dev/null
+++ b/app-containers/docker-compose/docker-compose-2.11.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2018-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND=">=app-containers/docker-cli-20.10.3"
+
+S="${WORKDIR}/compose-${MY_PV}"
+
+src_prepare() {
+ default
+ # do not strip
+ sed -i -e 's/-s -w//' Makefile || die
+}
+
+src_compile() {
+ emake VERSION=v${PV}
+}
+
+src_test() {
+ emake test
+}
+
+src_install() {
+ exeinto /usr/libexec/docker/cli-plugins
+ doexe bin/docker-compose
+ dodoc README.md
+}
+
+pkg_postinst() {
+ has_version =app-containers/docker-compose-1* || return
+ ewarn
+ ewarn "docker-compose 2.x is a sub command of docker"
+ ewarn "Use 'docker compose' from the command line instead of"
+ ewarn "'docker-compose'"
+ ewarn "If you need to keep 1.x around, please run the following"
+ ewarn "command before your next --depclean"
+ ewarn "# emerge --noreplace docker-compose:0"
+}
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2022-09-30 3:41 William Hubbs
0 siblings, 0 replies; 47+ messages in thread
From: William Hubbs @ 2022-09-30 3:41 UTC (permalink / raw
To: gentoo-commits
commit: 536f3cc282f026af7bf10609bdb633f8d6ca5a96
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 30 03:32:43 2022 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Sep 30 03:41:07 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=536f3cc2
app-containers/docker-compose: fix installation
Bug: https://bugs.gentoo.org/873493
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
app-containers/docker-compose/docker-compose-2.11.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-containers/docker-compose/docker-compose-2.11.2.ebuild b/app-containers/docker-compose/docker-compose-2.11.2.ebuild
index 26e531c4ce68..b29f582cff9c 100644
--- a/app-containers/docker-compose/docker-compose-2.11.2.ebuild
+++ b/app-containers/docker-compose/docker-compose-2.11.2.ebuild
@@ -34,7 +34,7 @@ src_test() {
src_install() {
exeinto /usr/libexec/docker/cli-plugins
- doexe bin/docker-compose
+ doexe bin/build/docker-compose
dodoc README.md
}
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2022-11-15 4:10 William Hubbs
0 siblings, 0 replies; 47+ messages in thread
From: William Hubbs @ 2022-11-15 4:10 UTC (permalink / raw
To: gentoo-commits
commit: dd62ae90d4380da8f55f5971d1c3c1b8790b7088
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 15 04:08:07 2022 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Nov 15 04:08:21 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd62ae90
app-containers/docker-compose: add 2.12.2
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
app-containers/docker-compose/Manifest | 2 +
.../docker-compose/docker-compose-2.12.2.ebuild | 49 ++++++++++++++++++++++
2 files changed, 51 insertions(+)
diff --git a/app-containers/docker-compose/Manifest b/app-containers/docker-compose/Manifest
index 12180ede71c1..e8470e9b68a5 100644
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@@ -1,6 +1,8 @@
DIST docker-compose-1.29.2.tar.gz 320320 BLAKE2B 2d1a6375127fa09661822f7148665161b45bbd234c93444ae31c1d926513fcbc9fb845f8af01d8f11788f24b7517bff5f6cea2a5da9ade897891f2dd728f26bd SHA512 09f2ae2ae7a17ab5fb3e22580f7a80f1a8253f7ad9fc8f29aca432911bcde46ed22030ff3073cdd7eff3d55aaba17f56e628a178ec05c3a9b4f28495d6045111
DIST docker-compose-2.11.2-deps.tar.xz 122617800 BLAKE2B 47fe7f6e1f0321498a4b0a060ea88758355be6ecd9b7798e3f614a62c93c5508dea744ab0437626c94d33ecee91f4d9e9ede0a4f26754ae96cc070b9e3377af5 SHA512 3f36191b35bb17d02d0c85ba64a2d79f6128f2d3ac1d1921ff348f165bbc92a91e92c20374159b6e7ed140a0a08f698473f0da35dd2e140ad3675c8eddc9fda3
DIST docker-compose-2.11.2.tar.gz 303314 BLAKE2B e395a820f0ef414021427ae01d390e30c8d6287c12b2b72c7e08f88219580370185bc48dbf31a30548c7b6f0ce0f070faa488d29689fbcd0d14af2b4fa2e4a67 SHA512 174ef8e38dce65f6ce117f8efdd24049dd9e56aa7c619242b4514ba258461ec1d65b2d226601a6efb3caf7b8516ba5c65af48854f70a2eff25adcdd3f9b9f697
+DIST docker-compose-2.12.2-deps.tar.xz 139592724 BLAKE2B fd0e375e9cefe802d6d557763838959712f31391c2ac4e5e41d37ce2b6df209c35e86f255197ccb39ca04dc9ea9b04de29347570d0d1b0ed5a0b2d094c5e24a7 SHA512 af4e431dbb4735fa1a2aff2271e052479b4e4dac83f2d7a733aac9aab0ac33e00499d81b6c8a6a36aa330618a89c44993c5b27349752678ce1ac41921f12dfbe
+DIST docker-compose-2.12.2.tar.gz 305198 BLAKE2B a39a0c2266abc442f1c65ac00da9dd380df85d2aaa9429898461f12138fe64a7a6c74a45b3bb734419b7093ec69a44b49dfc57ff264a2d3cb576a78a0720db03 SHA512 dfb82ecc5a984d7193da164924c1e430d07b6378028dac7264b8084da2e315e5c5091803a5db79fe27ed06b002c62b295d873b9371bd19d4550a37a28f8ec952
DIST docker-compose-2.5.0-deps.tar.xz 110626568 BLAKE2B 657d4d421172a6ba3516475045af50ef2351cc847933a799b7232ad6a46485d7961ad5875c9f19bf96d39adf275ca943d02fba2b939a210c080c6d38211e56f5 SHA512 231416474c6b3f73911bc7cf344ea5bfdb719cecf6ad7b159c755814df08ffcb60d05ccbdd294211cb7f64a52a5a81e2dfd357bdc10738918d47a75909d20bf9
DIST docker-compose-2.5.0.tar.gz 274812 BLAKE2B cf3b49cc13a8ab37d6426e78f4d9fca9a7b629346d292458e32ca2b66d20ba49929cc354d570b05deec3a0e0ac7778a02045ea87070059fc20c352f2d2ddb589 SHA512 7b556394e58dcdd49229c608d0672fe1aa5bd0b715f49b4b3e2ecbea16cc4962deb7e816ea057a8a565c598c21207316b8f7b5e41f0af0c3f330054ae81c2703
DIST docker-compose-2.6.0-deps.tar.xz 110634424 BLAKE2B a63f67babac39bb3cc01cdf1a6db24d6612f0d1e9d41eb4d60e83153f3acc5f096cc323a28cba8ae7ff0e43c18b10427cf80a235e8d3463827487d479ef0db3e SHA512 d3001fda9da5523594d684db4f12c85c41a4b6e64d7f97b774d0d3ce68c7c301d466f7a4e2a1c9e17b23fca124b6fc253746255919b5212f7bb6d72d3bed85e5
diff --git a/app-containers/docker-compose/docker-compose-2.12.2.ebuild b/app-containers/docker-compose/docker-compose-2.12.2.ebuild
new file mode 100644
index 000000000000..67d20deb634b
--- /dev/null
+++ b/app-containers/docker-compose/docker-compose-2.12.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2018-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND=">=app-containers/docker-cli-20.10.3"
+
+S="${WORKDIR}/compose-${MY_PV}"
+
+src_prepare() {
+ default
+ # do not strip
+ sed -i -e 's/-s -w//' Makefile || die
+}
+
+src_compile() {
+ emake VERSION=v${PV}
+}
+
+src_test() {
+ emake test
+}
+
+src_install() {
+ exeinto /usr/libexec/docker/cli-plugins
+ doexe bin/build/docker-compose
+ dodoc README.md
+}
+
+pkg_postinst() {
+ ewarn
+ ewarn "docker-compose 2.x is a sub command of docker"
+ ewarn "Use 'docker compose' from the command line instead of"
+ ewarn "'docker-compose'"
+ ewarn "If you need to keep 1.x around, please run the following"
+ ewarn "command before your next --depclean"
+ ewarn "# emerge --noreplace docker-compose:0"
+}
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2022-11-15 4:10 William Hubbs
0 siblings, 0 replies; 47+ messages in thread
From: William Hubbs @ 2022-11-15 4:10 UTC (permalink / raw
To: gentoo-commits
commit: 068a7230425455c82a23bce04f1d305de9da9892
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 15 04:09:48 2022 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Nov 15 04:09:48 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=068a7230
app-containers/docker-compose: drop 2.5.0, 2.6.0, 2.11.2
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
app-containers/docker-compose/Manifest | 6 ---
.../docker-compose/docker-compose-2.11.2.ebuild | 50 ----------------------
.../docker-compose/docker-compose-2.5.0.ebuild | 50 ----------------------
.../docker-compose/docker-compose-2.6.0.ebuild | 50 ----------------------
4 files changed, 156 deletions(-)
diff --git a/app-containers/docker-compose/Manifest b/app-containers/docker-compose/Manifest
index e8470e9b68a5..42d5467f54f8 100644
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@@ -1,9 +1,3 @@
DIST docker-compose-1.29.2.tar.gz 320320 BLAKE2B 2d1a6375127fa09661822f7148665161b45bbd234c93444ae31c1d926513fcbc9fb845f8af01d8f11788f24b7517bff5f6cea2a5da9ade897891f2dd728f26bd SHA512 09f2ae2ae7a17ab5fb3e22580f7a80f1a8253f7ad9fc8f29aca432911bcde46ed22030ff3073cdd7eff3d55aaba17f56e628a178ec05c3a9b4f28495d6045111
-DIST docker-compose-2.11.2-deps.tar.xz 122617800 BLAKE2B 47fe7f6e1f0321498a4b0a060ea88758355be6ecd9b7798e3f614a62c93c5508dea744ab0437626c94d33ecee91f4d9e9ede0a4f26754ae96cc070b9e3377af5 SHA512 3f36191b35bb17d02d0c85ba64a2d79f6128f2d3ac1d1921ff348f165bbc92a91e92c20374159b6e7ed140a0a08f698473f0da35dd2e140ad3675c8eddc9fda3
-DIST docker-compose-2.11.2.tar.gz 303314 BLAKE2B e395a820f0ef414021427ae01d390e30c8d6287c12b2b72c7e08f88219580370185bc48dbf31a30548c7b6f0ce0f070faa488d29689fbcd0d14af2b4fa2e4a67 SHA512 174ef8e38dce65f6ce117f8efdd24049dd9e56aa7c619242b4514ba258461ec1d65b2d226601a6efb3caf7b8516ba5c65af48854f70a2eff25adcdd3f9b9f697
DIST docker-compose-2.12.2-deps.tar.xz 139592724 BLAKE2B fd0e375e9cefe802d6d557763838959712f31391c2ac4e5e41d37ce2b6df209c35e86f255197ccb39ca04dc9ea9b04de29347570d0d1b0ed5a0b2d094c5e24a7 SHA512 af4e431dbb4735fa1a2aff2271e052479b4e4dac83f2d7a733aac9aab0ac33e00499d81b6c8a6a36aa330618a89c44993c5b27349752678ce1ac41921f12dfbe
DIST docker-compose-2.12.2.tar.gz 305198 BLAKE2B a39a0c2266abc442f1c65ac00da9dd380df85d2aaa9429898461f12138fe64a7a6c74a45b3bb734419b7093ec69a44b49dfc57ff264a2d3cb576a78a0720db03 SHA512 dfb82ecc5a984d7193da164924c1e430d07b6378028dac7264b8084da2e315e5c5091803a5db79fe27ed06b002c62b295d873b9371bd19d4550a37a28f8ec952
-DIST docker-compose-2.5.0-deps.tar.xz 110626568 BLAKE2B 657d4d421172a6ba3516475045af50ef2351cc847933a799b7232ad6a46485d7961ad5875c9f19bf96d39adf275ca943d02fba2b939a210c080c6d38211e56f5 SHA512 231416474c6b3f73911bc7cf344ea5bfdb719cecf6ad7b159c755814df08ffcb60d05ccbdd294211cb7f64a52a5a81e2dfd357bdc10738918d47a75909d20bf9
-DIST docker-compose-2.5.0.tar.gz 274812 BLAKE2B cf3b49cc13a8ab37d6426e78f4d9fca9a7b629346d292458e32ca2b66d20ba49929cc354d570b05deec3a0e0ac7778a02045ea87070059fc20c352f2d2ddb589 SHA512 7b556394e58dcdd49229c608d0672fe1aa5bd0b715f49b4b3e2ecbea16cc4962deb7e816ea057a8a565c598c21207316b8f7b5e41f0af0c3f330054ae81c2703
-DIST docker-compose-2.6.0-deps.tar.xz 110634424 BLAKE2B a63f67babac39bb3cc01cdf1a6db24d6612f0d1e9d41eb4d60e83153f3acc5f096cc323a28cba8ae7ff0e43c18b10427cf80a235e8d3463827487d479ef0db3e SHA512 d3001fda9da5523594d684db4f12c85c41a4b6e64d7f97b774d0d3ce68c7c301d466f7a4e2a1c9e17b23fca124b6fc253746255919b5212f7bb6d72d3bed85e5
-DIST docker-compose-2.6.0.tar.gz 277387 BLAKE2B e4ca8d614a8ae860dcda77e3b655ff6a8f4af8b4c77e679cdfe256053ac6b0bbbf77a92f2ca871a6d95120c2bbb54093979f816be3c367ff59e355e57fe063d8 SHA512 df8402f0f827b7c1defbb7d0b5037ea38db98337d8ebc4756f0316cf55e368e6c61401fb0d000e1942e0878d5ce1870b0f2a3217ac4b34d1e5f4c3aab68832fe
diff --git a/app-containers/docker-compose/docker-compose-2.11.2.ebuild b/app-containers/docker-compose/docker-compose-2.11.2.ebuild
deleted file mode 100644
index b29f582cff9c..000000000000
--- a/app-containers/docker-compose/docker-compose-2.11.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2018-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module
-MY_PV=${PV/_/-}
-
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://github.com/docker/compose"
-SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND=">=app-containers/docker-cli-20.10.3"
-
-S="${WORKDIR}/compose-${MY_PV}"
-
-src_prepare() {
- default
- # do not strip
- sed -i -e 's/-s -w//' Makefile || die
-}
-
-src_compile() {
- emake VERSION=v${PV}
-}
-
-src_test() {
- emake test
-}
-
-src_install() {
- exeinto /usr/libexec/docker/cli-plugins
- doexe bin/build/docker-compose
- dodoc README.md
-}
-
-pkg_postinst() {
- has_version =app-containers/docker-compose-1* || return
- ewarn
- ewarn "docker-compose 2.x is a sub command of docker"
- ewarn "Use 'docker compose' from the command line instead of"
- ewarn "'docker-compose'"
- ewarn "If you need to keep 1.x around, please run the following"
- ewarn "command before your next --depclean"
- ewarn "# emerge --noreplace docker-compose:0"
-}
diff --git a/app-containers/docker-compose/docker-compose-2.5.0.ebuild b/app-containers/docker-compose/docker-compose-2.5.0.ebuild
deleted file mode 100644
index 3946a436a4be..000000000000
--- a/app-containers/docker-compose/docker-compose-2.5.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2018-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module
-MY_PV=${PV/_/-}
-
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://github.com/docker/compose"
-SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND=">=app-containers/docker-cli-20.10.3"
-
-S="${WORKDIR}/compose-${MY_PV}"
-
-src_prepare() {
- default
- # do not strip
- sed -i -e 's/-s -w//' builder.Makefile || die
-}
-
-src_compile() {
- emake -f builder.Makefile GIT_TAG=v${PV}
-}
-
-src_test() {
- emake -f builder.Makefile test
-}
-
-src_install() {
- exeinto /usr/libexec/docker/cli-plugins
- doexe bin/docker-compose
- dodoc README.md
-}
-
-pkg_postinst() {
- has_version =app-containers/docker-compose-1* || return
- ewarn
- ewarn "docker-compose 2.x is a sub command of docker"
- ewarn "Use 'docker compose' from the command line instead of"
- ewarn "'docker-compose'"
- ewarn "If you need to keep 1.x around, please run the following"
- ewarn "command before your next --depclean"
- ewarn "# emerge --noreplace docker-compose:0"
-}
diff --git a/app-containers/docker-compose/docker-compose-2.6.0.ebuild b/app-containers/docker-compose/docker-compose-2.6.0.ebuild
deleted file mode 100644
index 3946a436a4be..000000000000
--- a/app-containers/docker-compose/docker-compose-2.6.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2018-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module
-MY_PV=${PV/_/-}
-
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://github.com/docker/compose"
-SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND=">=app-containers/docker-cli-20.10.3"
-
-S="${WORKDIR}/compose-${MY_PV}"
-
-src_prepare() {
- default
- # do not strip
- sed -i -e 's/-s -w//' builder.Makefile || die
-}
-
-src_compile() {
- emake -f builder.Makefile GIT_TAG=v${PV}
-}
-
-src_test() {
- emake -f builder.Makefile test
-}
-
-src_install() {
- exeinto /usr/libexec/docker/cli-plugins
- doexe bin/docker-compose
- dodoc README.md
-}
-
-pkg_postinst() {
- has_version =app-containers/docker-compose-1* || return
- ewarn
- ewarn "docker-compose 2.x is a sub command of docker"
- ewarn "Use 'docker compose' from the command line instead of"
- ewarn "'docker-compose'"
- ewarn "If you need to keep 1.x around, please run the following"
- ewarn "command before your next --depclean"
- ewarn "# emerge --noreplace docker-compose:0"
-}
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2023-03-10 2:34 Sebastian Pipping
0 siblings, 0 replies; 47+ messages in thread
From: Sebastian Pipping @ 2023-03-10 2:34 UTC (permalink / raw
To: gentoo-commits
commit: 27393a83be2a3805d617ca2383ee473eb921862b
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 10 02:29:11 2023 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Mar 10 02:33:35 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27393a83
app-containers/docker-compose: Python 3.11
Closes: https://bugs.gentoo.org/896510
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
.../docker-compose/docker-compose-1.29.2-r3.ebuild | 73 ++++++++++++++++++++++
1 file changed, 73 insertions(+)
diff --git a/app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild b/app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild
new file mode 100644
index 000000000000..e27bbf0f9c99
--- /dev/null
+++ b/app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2018-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit bash-completion-r1 distutils-r1
+
+MY_PV=${PV/_/-}
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+ >=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/docker-py-5[${PYTHON_USEDEP}]
+ >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+ >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+ >=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+ dev-python/paramiko[${PYTHON_USEDEP}]
+ >=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+ >=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
+ >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+ test? (
+ >=dev-python/pytest-5[${PYTHON_USEDEP}]
+ >=dev-python/ddt-1.2.2[${PYTHON_USEDEP}]
+ dev-python/py[${PYTHON_USEDEP}]
+ )"
+
+S="${WORKDIR}/compose-${MY_PV}"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+ # Bug #679968 -- https://bugs.gentoo.org/679968
+ # Bug #681002 -- https://bugs.gentoo.org/681002
+ "${FILESDIR}"/${PN}-1.29.0-setup-py.patch
+ "${FILESDIR}"/${P}-tests-unit-cli-test-py.patch
+)
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+ # Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
+ sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
+
+ default
+}
+
+python_test() {
+ distutils_install_for_testing
+ epytest tests/unit/
+}
+
+python_install_all() {
+ newbashcomp contrib/completion/bash/docker-compose ${PN}
+
+ insinto /usr/share/zsh/site-functions
+ doins contrib/completion/zsh/*
+
+ distutils-r1_python_install_all
+}
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2023-03-10 21:35 William Hubbs
0 siblings, 0 replies; 47+ messages in thread
From: William Hubbs @ 2023-03-10 21:35 UTC (permalink / raw
To: gentoo-commits
commit: fcae59dbd8e7c0d6d8e1975d09f4099eca72cf5d
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 10 21:35:22 2023 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Mar 10 21:35:22 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcae59db
app-containers/docker-compose: add 2.16.0
Closes: https://bugs.gentoo.org/894412
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
app-containers/docker-compose/Manifest | 2 +
.../docker-compose/docker-compose-2.16.0.ebuild | 49 ++++++++++++++++++++++
2 files changed, 51 insertions(+)
diff --git a/app-containers/docker-compose/Manifest b/app-containers/docker-compose/Manifest
index 8a8da99c8ed6..c3b083cdbdbd 100644
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@@ -1,3 +1,5 @@
DIST docker-compose-1.29.2.gh.tar.gz 320320 BLAKE2B 2d1a6375127fa09661822f7148665161b45bbd234c93444ae31c1d926513fcbc9fb845f8af01d8f11788f24b7517bff5f6cea2a5da9ade897891f2dd728f26bd SHA512 09f2ae2ae7a17ab5fb3e22580f7a80f1a8253f7ad9fc8f29aca432911bcde46ed22030ff3073cdd7eff3d55aaba17f56e628a178ec05c3a9b4f28495d6045111
DIST docker-compose-2.12.2-deps.tar.xz 139592724 BLAKE2B fd0e375e9cefe802d6d557763838959712f31391c2ac4e5e41d37ce2b6df209c35e86f255197ccb39ca04dc9ea9b04de29347570d0d1b0ed5a0b2d094c5e24a7 SHA512 af4e431dbb4735fa1a2aff2271e052479b4e4dac83f2d7a733aac9aab0ac33e00499d81b6c8a6a36aa330618a89c44993c5b27349752678ce1ac41921f12dfbe
DIST docker-compose-2.12.2.tar.gz 305198 BLAKE2B a39a0c2266abc442f1c65ac00da9dd380df85d2aaa9429898461f12138fe64a7a6c74a45b3bb734419b7093ec69a44b49dfc57ff264a2d3cb576a78a0720db03 SHA512 dfb82ecc5a984d7193da164924c1e430d07b6378028dac7264b8084da2e315e5c5091803a5db79fe27ed06b002c62b295d873b9371bd19d4550a37a28f8ec952
+DIST docker-compose-2.16.0-deps.tar.xz 194381032 BLAKE2B 69f06124ac0b2e520b9948e4aab48c0ee9a9c5bef62ca70d70695dfe2ea3c51f69ec2b45f3e1b180b314d520a5d7028d81d5b2d760a747cb2c935c9621be374b SHA512 fd552426ac6befc55efd7dd505dc70a512dd736f12395cf7f107bdd508f95d4bf37d78ebf05e9daa4ac25fce0139c988ffd90cf2822fea8d7cf6666b6b834f8e
+DIST docker-compose-2.16.0.tar.gz 302946 BLAKE2B 3f2e03151be62982749c884af574f13798c2a85ffdf2736641a1df165fcd80c29fa611ad55a0655de6c5cf911783cd3b98392ddc4375b09da0179d774eea4959 SHA512 2158c829de298529e3192cb8e201c554f89fa7554a81eae858470db30b41d03925aa4dce9ef6d22c295625abf67ab181f851f05818dc76e2a5d6c46554d5ca3f
diff --git a/app-containers/docker-compose/docker-compose-2.16.0.ebuild b/app-containers/docker-compose/docker-compose-2.16.0.ebuild
new file mode 100644
index 000000000000..a8e67ae22e10
--- /dev/null
+++ b/app-containers/docker-compose/docker-compose-2.16.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2018-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND=">=app-containers/docker-cli-23.0.0"
+
+S="${WORKDIR}/compose-${MY_PV}"
+
+src_prepare() {
+ default
+ # do not strip
+ sed -i -e 's/-s -w//' Makefile || die
+}
+
+src_compile() {
+ emake VERSION=v${PV}
+}
+
+src_test() {
+ emake test
+}
+
+src_install() {
+ exeinto /usr/libexec/docker/cli-plugins
+ doexe bin/build/docker-compose
+ dodoc README.md
+}
+
+pkg_postinst() {
+ ewarn
+ ewarn "docker-compose 2.x is a sub command of docker"
+ ewarn "Use 'docker compose' from the command line instead of"
+ ewarn "'docker-compose'"
+ ewarn "If you need to keep 1.x around, please run the following"
+ ewarn "command before your next --depclean"
+ ewarn "# emerge --noreplace docker-compose:0"
+}
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2023-03-11 0:34 William Hubbs
0 siblings, 0 replies; 47+ messages in thread
From: William Hubbs @ 2023-03-11 0:34 UTC (permalink / raw
To: gentoo-commits
commit: 53e7eb032401e1f10a5248c5f214082a8f0f47b9
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 10 23:29:41 2023 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Mar 11 00:32:58 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53e7eb03
app-containers/docker-compose: unkeyword 2.16.0 for ~amd64, ~arm64
This needs docker-cli-23.0.1.
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
app-containers/docker-compose/docker-compose-2.16.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-containers/docker-compose/docker-compose-2.16.0.ebuild b/app-containers/docker-compose/docker-compose-2.16.0.ebuild
index a8e67ae22e10..ff968eb11724 100644
--- a/app-containers/docker-compose/docker-compose-2.16.0.ebuild
+++ b/app-containers/docker-compose/docker-compose-2.16.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="~amd64 ~arm64"
+# KEYWORDS="~amd64 ~arm64"
RDEPEND=">=app-containers/docker-cli-23.0.0"
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2023-03-11 21:43 William Hubbs
0 siblings, 0 replies; 47+ messages in thread
From: William Hubbs @ 2023-03-11 21:43 UTC (permalink / raw
To: gentoo-commits
commit: 1f94fb89323c13b436650f98dd745ccc70215f8d
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 11 21:41:52 2023 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Mar 11 21:41:52 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f94fb89
app-containers/docker-compose: keyword 2.16.0 for ~amd64, ~arm64
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
app-containers/docker-compose/docker-compose-2.16.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-containers/docker-compose/docker-compose-2.16.0.ebuild b/app-containers/docker-compose/docker-compose-2.16.0.ebuild
index ff968eb11724..a8e67ae22e10 100644
--- a/app-containers/docker-compose/docker-compose-2.16.0.ebuild
+++ b/app-containers/docker-compose/docker-compose-2.16.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
LICENSE="Apache-2.0"
SLOT="2"
-# KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64"
RDEPEND=">=app-containers/docker-cli-23.0.0"
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2023-04-07 4:13 William Hubbs
0 siblings, 0 replies; 47+ messages in thread
From: William Hubbs @ 2023-04-07 4:13 UTC (permalink / raw
To: gentoo-commits
commit: 47fb2323b4eaa1091436149beae5d2395e99f2c2
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 7 04:12:46 2023 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Apr 7 04:13:01 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47fb2323
app-containers/docker-compose: add 2.17.2
Closes: https://bugs.gentoo.org/903598
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
app-containers/docker-compose/Manifest | 2 +
.../docker-compose/docker-compose-2.17.2.ebuild | 49 ++++++++++++++++++++++
2 files changed, 51 insertions(+)
diff --git a/app-containers/docker-compose/Manifest b/app-containers/docker-compose/Manifest
index c3b083cdbdbd..bd0054c9a72d 100644
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@@ -3,3 +3,5 @@ DIST docker-compose-2.12.2-deps.tar.xz 139592724 BLAKE2B fd0e375e9cefe802d6d5577
DIST docker-compose-2.12.2.tar.gz 305198 BLAKE2B a39a0c2266abc442f1c65ac00da9dd380df85d2aaa9429898461f12138fe64a7a6c74a45b3bb734419b7093ec69a44b49dfc57ff264a2d3cb576a78a0720db03 SHA512 dfb82ecc5a984d7193da164924c1e430d07b6378028dac7264b8084da2e315e5c5091803a5db79fe27ed06b002c62b295d873b9371bd19d4550a37a28f8ec952
DIST docker-compose-2.16.0-deps.tar.xz 194381032 BLAKE2B 69f06124ac0b2e520b9948e4aab48c0ee9a9c5bef62ca70d70695dfe2ea3c51f69ec2b45f3e1b180b314d520a5d7028d81d5b2d760a747cb2c935c9621be374b SHA512 fd552426ac6befc55efd7dd505dc70a512dd736f12395cf7f107bdd508f95d4bf37d78ebf05e9daa4ac25fce0139c988ffd90cf2822fea8d7cf6666b6b834f8e
DIST docker-compose-2.16.0.tar.gz 302946 BLAKE2B 3f2e03151be62982749c884af574f13798c2a85ffdf2736641a1df165fcd80c29fa611ad55a0655de6c5cf911783cd3b98392ddc4375b09da0179d774eea4959 SHA512 2158c829de298529e3192cb8e201c554f89fa7554a81eae858470db30b41d03925aa4dce9ef6d22c295625abf67ab181f851f05818dc76e2a5d6c46554d5ca3f
+DIST docker-compose-2.17.2-deps.tar.xz 194695756 BLAKE2B 2a0ce1c41d09186f36ea4a935977a35edd80d013b6face813ac9622345ffa1ed8e090537ad990c4ee488ecccfe0575f92bb17f8baa0b8dc2104f75d18fac3877 SHA512 4649405eb0e49641265e514ef89cdae47806958611014ab9a9479848e857d85a5c3352ab44ff9ec39af1ca6fab67b6a2ae6c457d44690c1c1bcc3824aeb6fc07
+DIST docker-compose-2.17.2.tar.gz 310664 BLAKE2B bb36afe02b85dd4f64e6eefdb542cc954e03c11f5f3b39bcd5d84b8b4ea87218e222a89a9f20aa2b6e89afc6edd0e7ef68ccc98cbe4e26be5fe2a07f189ea07e SHA512 e0afb5ac5867f3fbe4c3216710f6f529832310e69cc8943f47d6e67fbbcc7c7541a589f6b42eed54c0415c10851dd635c0b73c4ca31dd0969c6bf68de2b40b8b
diff --git a/app-containers/docker-compose/docker-compose-2.17.2.ebuild b/app-containers/docker-compose/docker-compose-2.17.2.ebuild
new file mode 100644
index 000000000000..a8e67ae22e10
--- /dev/null
+++ b/app-containers/docker-compose/docker-compose-2.17.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2018-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND=">=app-containers/docker-cli-23.0.0"
+
+S="${WORKDIR}/compose-${MY_PV}"
+
+src_prepare() {
+ default
+ # do not strip
+ sed -i -e 's/-s -w//' Makefile || die
+}
+
+src_compile() {
+ emake VERSION=v${PV}
+}
+
+src_test() {
+ emake test
+}
+
+src_install() {
+ exeinto /usr/libexec/docker/cli-plugins
+ doexe bin/build/docker-compose
+ dodoc README.md
+}
+
+pkg_postinst() {
+ ewarn
+ ewarn "docker-compose 2.x is a sub command of docker"
+ ewarn "Use 'docker compose' from the command line instead of"
+ ewarn "'docker-compose'"
+ ewarn "If you need to keep 1.x around, please run the following"
+ ewarn "command before your next --depclean"
+ ewarn "# emerge --noreplace docker-compose:0"
+}
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2023-04-07 4:56 William Hubbs
0 siblings, 0 replies; 47+ messages in thread
From: William Hubbs @ 2023-04-07 4:56 UTC (permalink / raw
To: gentoo-commits
commit: 95004627eed0776b6e090335d1fe4fca7a36c07e
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 7 04:54:45 2023 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Apr 7 04:54:45 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95004627
app-containers/docker-compose: restrict tests
The tests require a running docker daemon.
Closes: https://bugs.gentoo.org/873589
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
app-containers/docker-compose/docker-compose-2.17.2.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/app-containers/docker-compose/docker-compose-2.17.2.ebuild b/app-containers/docker-compose/docker-compose-2.17.2.ebuild
index a8e67ae22e10..a47ff4eb91c7 100644
--- a/app-containers/docker-compose/docker-compose-2.17.2.ebuild
+++ b/app-containers/docker-compose/docker-compose-2.17.2.ebuild
@@ -16,6 +16,7 @@ KEYWORDS="~amd64 ~arm64"
RDEPEND=">=app-containers/docker-cli-23.0.0"
+RESTRICT="test"
S="${WORKDIR}/compose-${MY_PV}"
src_prepare() {
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2023-04-12 21:06 William Hubbs
0 siblings, 0 replies; 47+ messages in thread
From: William Hubbs @ 2023-04-12 21:06 UTC (permalink / raw
To: gentoo-commits
commit: ed16c19d3fdb2b40bc056dd1f0972e4101e44d1c
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 12 21:05:58 2023 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Apr 12 21:05:58 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed16c19d
app-containers/docker-compose: drop 2.12.2, 2.16.0
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
app-containers/docker-compose/Manifest | 4 --
.../docker-compose/docker-compose-2.12.2.ebuild | 49 ----------------------
.../docker-compose/docker-compose-2.16.0.ebuild | 49 ----------------------
3 files changed, 102 deletions(-)
diff --git a/app-containers/docker-compose/Manifest b/app-containers/docker-compose/Manifest
index bd0054c9a72d..833964b14985 100644
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@@ -1,7 +1,3 @@
DIST docker-compose-1.29.2.gh.tar.gz 320320 BLAKE2B 2d1a6375127fa09661822f7148665161b45bbd234c93444ae31c1d926513fcbc9fb845f8af01d8f11788f24b7517bff5f6cea2a5da9ade897891f2dd728f26bd SHA512 09f2ae2ae7a17ab5fb3e22580f7a80f1a8253f7ad9fc8f29aca432911bcde46ed22030ff3073cdd7eff3d55aaba17f56e628a178ec05c3a9b4f28495d6045111
-DIST docker-compose-2.12.2-deps.tar.xz 139592724 BLAKE2B fd0e375e9cefe802d6d557763838959712f31391c2ac4e5e41d37ce2b6df209c35e86f255197ccb39ca04dc9ea9b04de29347570d0d1b0ed5a0b2d094c5e24a7 SHA512 af4e431dbb4735fa1a2aff2271e052479b4e4dac83f2d7a733aac9aab0ac33e00499d81b6c8a6a36aa330618a89c44993c5b27349752678ce1ac41921f12dfbe
-DIST docker-compose-2.12.2.tar.gz 305198 BLAKE2B a39a0c2266abc442f1c65ac00da9dd380df85d2aaa9429898461f12138fe64a7a6c74a45b3bb734419b7093ec69a44b49dfc57ff264a2d3cb576a78a0720db03 SHA512 dfb82ecc5a984d7193da164924c1e430d07b6378028dac7264b8084da2e315e5c5091803a5db79fe27ed06b002c62b295d873b9371bd19d4550a37a28f8ec952
-DIST docker-compose-2.16.0-deps.tar.xz 194381032 BLAKE2B 69f06124ac0b2e520b9948e4aab48c0ee9a9c5bef62ca70d70695dfe2ea3c51f69ec2b45f3e1b180b314d520a5d7028d81d5b2d760a747cb2c935c9621be374b SHA512 fd552426ac6befc55efd7dd505dc70a512dd736f12395cf7f107bdd508f95d4bf37d78ebf05e9daa4ac25fce0139c988ffd90cf2822fea8d7cf6666b6b834f8e
-DIST docker-compose-2.16.0.tar.gz 302946 BLAKE2B 3f2e03151be62982749c884af574f13798c2a85ffdf2736641a1df165fcd80c29fa611ad55a0655de6c5cf911783cd3b98392ddc4375b09da0179d774eea4959 SHA512 2158c829de298529e3192cb8e201c554f89fa7554a81eae858470db30b41d03925aa4dce9ef6d22c295625abf67ab181f851f05818dc76e2a5d6c46554d5ca3f
DIST docker-compose-2.17.2-deps.tar.xz 194695756 BLAKE2B 2a0ce1c41d09186f36ea4a935977a35edd80d013b6face813ac9622345ffa1ed8e090537ad990c4ee488ecccfe0575f92bb17f8baa0b8dc2104f75d18fac3877 SHA512 4649405eb0e49641265e514ef89cdae47806958611014ab9a9479848e857d85a5c3352ab44ff9ec39af1ca6fab67b6a2ae6c457d44690c1c1bcc3824aeb6fc07
DIST docker-compose-2.17.2.tar.gz 310664 BLAKE2B bb36afe02b85dd4f64e6eefdb542cc954e03c11f5f3b39bcd5d84b8b4ea87218e222a89a9f20aa2b6e89afc6edd0e7ef68ccc98cbe4e26be5fe2a07f189ea07e SHA512 e0afb5ac5867f3fbe4c3216710f6f529832310e69cc8943f47d6e67fbbcc7c7541a589f6b42eed54c0415c10851dd635c0b73c4ca31dd0969c6bf68de2b40b8b
diff --git a/app-containers/docker-compose/docker-compose-2.12.2.ebuild b/app-containers/docker-compose/docker-compose-2.12.2.ebuild
deleted file mode 100644
index 67d20deb634b..000000000000
--- a/app-containers/docker-compose/docker-compose-2.12.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2018-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module
-MY_PV=${PV/_/-}
-
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://github.com/docker/compose"
-SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND=">=app-containers/docker-cli-20.10.3"
-
-S="${WORKDIR}/compose-${MY_PV}"
-
-src_prepare() {
- default
- # do not strip
- sed -i -e 's/-s -w//' Makefile || die
-}
-
-src_compile() {
- emake VERSION=v${PV}
-}
-
-src_test() {
- emake test
-}
-
-src_install() {
- exeinto /usr/libexec/docker/cli-plugins
- doexe bin/build/docker-compose
- dodoc README.md
-}
-
-pkg_postinst() {
- ewarn
- ewarn "docker-compose 2.x is a sub command of docker"
- ewarn "Use 'docker compose' from the command line instead of"
- ewarn "'docker-compose'"
- ewarn "If you need to keep 1.x around, please run the following"
- ewarn "command before your next --depclean"
- ewarn "# emerge --noreplace docker-compose:0"
-}
diff --git a/app-containers/docker-compose/docker-compose-2.16.0.ebuild b/app-containers/docker-compose/docker-compose-2.16.0.ebuild
deleted file mode 100644
index a8e67ae22e10..000000000000
--- a/app-containers/docker-compose/docker-compose-2.16.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2018-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module
-MY_PV=${PV/_/-}
-
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://github.com/docker/compose"
-SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND=">=app-containers/docker-cli-23.0.0"
-
-S="${WORKDIR}/compose-${MY_PV}"
-
-src_prepare() {
- default
- # do not strip
- sed -i -e 's/-s -w//' Makefile || die
-}
-
-src_compile() {
- emake VERSION=v${PV}
-}
-
-src_test() {
- emake test
-}
-
-src_install() {
- exeinto /usr/libexec/docker/cli-plugins
- doexe bin/build/docker-compose
- dodoc README.md
-}
-
-pkg_postinst() {
- ewarn
- ewarn "docker-compose 2.x is a sub command of docker"
- ewarn "Use 'docker compose' from the command line instead of"
- ewarn "'docker-compose'"
- ewarn "If you need to keep 1.x around, please run the following"
- ewarn "command before your next --depclean"
- ewarn "# emerge --noreplace docker-compose:0"
-}
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2023-04-13 1:49 Sam James
0 siblings, 0 replies; 47+ messages in thread
From: Sam James @ 2023-04-13 1:49 UTC (permalink / raw
To: gentoo-commits
commit: 9db32c04f19112f3635086ce68600b1929d7bd78
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 13 01:48:27 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 13 01:48:37 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9db32c04
app-containers/docker-compose: Stabilize 2.17.2 amd64, #894414
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-containers/docker-compose/docker-compose-2.17.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-containers/docker-compose/docker-compose-2.17.2.ebuild b/app-containers/docker-compose/docker-compose-2.17.2.ebuild
index a47ff4eb91c7..771a864f5643 100644
--- a/app-containers/docker-compose/docker-compose-2.17.2.ebuild
+++ b/app-containers/docker-compose/docker-compose-2.17.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
RDEPEND=">=app-containers/docker-cli-23.0.0"
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2023-04-13 1:49 Sam James
0 siblings, 0 replies; 47+ messages in thread
From: Sam James @ 2023-04-13 1:49 UTC (permalink / raw
To: gentoo-commits
commit: e7a3430b00c6fc023af9823e00dd7134c7c42df3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 13 01:48:29 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 13 01:48:38 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7a3430b
app-containers/docker-compose: Stabilize 2.17.2 arm64, #894414
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-containers/docker-compose/docker-compose-2.17.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-containers/docker-compose/docker-compose-2.17.2.ebuild b/app-containers/docker-compose/docker-compose-2.17.2.ebuild
index 771a864f5643..d2cc28a60ea6 100644
--- a/app-containers/docker-compose/docker-compose-2.17.2.ebuild
+++ b/app-containers/docker-compose/docker-compose-2.17.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 arm64"
RDEPEND=">=app-containers/docker-cli-23.0.0"
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2023-04-16 16:43 Sebastian Pipping
0 siblings, 0 replies; 47+ messages in thread
From: Sebastian Pipping @ 2023-04-16 16:43 UTC (permalink / raw
To: gentoo-commits
commit: b878bed9232954233f5709b4d72796525ec82626
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 16 16:40:42 2023 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Apr 16 16:42:59 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b878bed9
app-containers/docker-compose: Formalize split maintainership
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
app-containers/docker-compose/metadata.xml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/app-containers/docker-compose/metadata.xml b/app-containers/docker-compose/metadata.xml
index cf47ba4d85b4..06f0c4e4e3e3 100644
--- a/app-containers/docker-compose/metadata.xml
+++ b/app-containers/docker-compose/metadata.xml
@@ -1,13 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person"><!-- for 2.x.x (Golang) -->
+ <maintainer restrict=">=app-containers/docker-compose-2" type="person">
<email>williamh@gentoo.org</email>
<name>William Hubbs</name>
+ <description>Version 2.x.x (Golang)</description>
</maintainer>
- <maintainer type="person"><!-- for 1.x.x (Python) -->
+ <maintainer restrict="<app-containers/docker-compose-2" type="person">
<email>sping@gentoo.org</email>
<name>Sebastian Pipping</name>
+ <description>Version 1.x.x (Python)</description>
</maintainer>
<upstream>
<remote-id type="pypi">docker-compose</remote-id>
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2023-04-19 18:09 Arthur Zamarin
0 siblings, 0 replies; 47+ messages in thread
From: Arthur Zamarin @ 2023-04-19 18:09 UTC (permalink / raw
To: gentoo-commits
commit: 11322948cd079d385fd83311d5bf17a0815c769f
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 19 18:08:54 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 19 18:08:54 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11322948
app-containers/docker-compose: Stabilize 1.29.2-r3 arm64, #904614
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild b/app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild
index e27bbf0f9c99..90aa5aa0b0db 100644
--- a/app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild
+++ b/app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.gh.ta
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 arm64"
RDEPEND="
>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2023-04-20 5:01 Sam James
0 siblings, 0 replies; 47+ messages in thread
From: Sam James @ 2023-04-20 5:01 UTC (permalink / raw
To: gentoo-commits
commit: d1b161e0c7665ebc4b934625c1f7ccb96585d1e8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 20 05:00:43 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 20 05:01:11 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1b161e0
app-containers/docker-compose: Stabilize 1.29.2-r3 amd64, #904614
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild b/app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild
index 90aa5aa0b0db..4f274a47deae 100644
--- a/app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild
+++ b/app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.gh.ta
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 arm64"
+KEYWORDS="amd64 arm64"
RDEPEND="
>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2023-07-08 14:05 Sebastian Pipping
0 siblings, 0 replies; 47+ messages in thread
From: Sebastian Pipping @ 2023-07-08 14:05 UTC (permalink / raw
To: gentoo-commits
commit: b246a975f58e667d58899ddd5dde33c45d494fe7
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 8 14:03:29 2023 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Jul 8 14:03:29 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b246a975
app-containers/docker-compose: Start using DISTUTILS_USE_PEP517
Closes: https://bugs.gentoo.org/909866
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
.../docker-compose/docker-compose-1.29.2-r4.ebuild | 73 ++++++++++++++++++++++
1 file changed, 73 insertions(+)
diff --git a/app-containers/docker-compose/docker-compose-1.29.2-r4.ebuild b/app-containers/docker-compose/docker-compose-1.29.2-r4.ebuild
new file mode 100644
index 000000000000..6512e3b8ce7f
--- /dev/null
+++ b/app-containers/docker-compose/docker-compose-1.29.2-r4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2018-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit bash-completion-r1 distutils-r1
+
+MY_PV=${PV/_/-}
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+ >=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/docker-5[${PYTHON_USEDEP}]
+ >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+ >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+ >=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+ dev-python/paramiko[${PYTHON_USEDEP}]
+ >=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+ >=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
+ >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+ test? (
+ >=dev-python/pytest-5[${PYTHON_USEDEP}]
+ >=dev-python/ddt-1.2.2[${PYTHON_USEDEP}]
+ dev-python/py[${PYTHON_USEDEP}]
+ )"
+
+S="${WORKDIR}/compose-${MY_PV}"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+ # Bug #679968 -- https://bugs.gentoo.org/679968
+ # Bug #681002 -- https://bugs.gentoo.org/681002
+ "${FILESDIR}"/${PN}-1.29.0-setup-py.patch
+ "${FILESDIR}"/${P}-tests-unit-cli-test-py.patch
+)
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+ # Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
+ sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
+
+ default
+}
+
+python_test() {
+ epytest tests/unit/
+}
+
+python_install_all() {
+ newbashcomp contrib/completion/bash/docker-compose ${PN}
+
+ insinto /usr/share/zsh/site-functions
+ doins contrib/completion/zsh/*
+
+ distutils-r1_python_install_all
+}
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2023-08-11 15:20 William Hubbs
0 siblings, 0 replies; 47+ messages in thread
From: William Hubbs @ 2023-08-11 15:20 UTC (permalink / raw
To: gentoo-commits
commit: 8d518bcfc1d661943a8f981b6860f5cf6075a47b
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 11 15:18:46 2023 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Aug 11 15:20:18 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d518bcf
app-containers/docker-compose: add 2.20.2
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
app-containers/docker-compose/Manifest | 2 +
.../docker-compose/docker-compose-2.20.2.ebuild | 50 ++++++++++++++++++++++
2 files changed, 52 insertions(+)
diff --git a/app-containers/docker-compose/Manifest b/app-containers/docker-compose/Manifest
index 833964b14985..77046f628f2a 100644
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@@ -1,3 +1,5 @@
DIST docker-compose-1.29.2.gh.tar.gz 320320 BLAKE2B 2d1a6375127fa09661822f7148665161b45bbd234c93444ae31c1d926513fcbc9fb845f8af01d8f11788f24b7517bff5f6cea2a5da9ade897891f2dd728f26bd SHA512 09f2ae2ae7a17ab5fb3e22580f7a80f1a8253f7ad9fc8f29aca432911bcde46ed22030ff3073cdd7eff3d55aaba17f56e628a178ec05c3a9b4f28495d6045111
DIST docker-compose-2.17.2-deps.tar.xz 194695756 BLAKE2B 2a0ce1c41d09186f36ea4a935977a35edd80d013b6face813ac9622345ffa1ed8e090537ad990c4ee488ecccfe0575f92bb17f8baa0b8dc2104f75d18fac3877 SHA512 4649405eb0e49641265e514ef89cdae47806958611014ab9a9479848e857d85a5c3352ab44ff9ec39af1ca6fab67b6a2ae6c457d44690c1c1bcc3824aeb6fc07
DIST docker-compose-2.17.2.tar.gz 310664 BLAKE2B bb36afe02b85dd4f64e6eefdb542cc954e03c11f5f3b39bcd5d84b8b4ea87218e222a89a9f20aa2b6e89afc6edd0e7ef68ccc98cbe4e26be5fe2a07f189ea07e SHA512 e0afb5ac5867f3fbe4c3216710f6f529832310e69cc8943f47d6e67fbbcc7c7541a589f6b42eed54c0415c10851dd635c0b73c4ca31dd0969c6bf68de2b40b8b
+DIST docker-compose-2.20.2-deps.tar.xz 182125748 BLAKE2B 0e388c6f1e67f2e7e3048e89806c72fbcc25ec3641dfe7317c40c84afff4bed85bca472ca3906244a3bcd942794b38d59160cb0e0b478aa7e032f66e63629db4 SHA512 cd7f796ff90d504f0f52092b46120ce88cc0b274caa41bd48d481fab0872505238026e4036e6e929885c9de1c5906d345001a19038281e87386d972082bf974c
+DIST docker-compose-2.20.2.tar.gz 328019 BLAKE2B 0de19af3909dff4e5eadbb137969dbbcd46d7ff4d43076aae3e524567ebf49f5351cab9fca2fd1e4abd22d58483998d0444ade9c3a372f79a69fb234b8786c42 SHA512 8b8ccece806edfaffef497ed8b8b64c6050aa35363e350a14b5a257c9230ed5656a0e5661ce6c314c2911b438780421f71714477a83e2e64db2cf6c921f86af1
diff --git a/app-containers/docker-compose/docker-compose-2.20.2.ebuild b/app-containers/docker-compose/docker-compose-2.20.2.ebuild
new file mode 100644
index 000000000000..a47ff4eb91c7
--- /dev/null
+++ b/app-containers/docker-compose/docker-compose-2.20.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2018-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND=">=app-containers/docker-cli-23.0.0"
+
+RESTRICT="test"
+S="${WORKDIR}/compose-${MY_PV}"
+
+src_prepare() {
+ default
+ # do not strip
+ sed -i -e 's/-s -w//' Makefile || die
+}
+
+src_compile() {
+ emake VERSION=v${PV}
+}
+
+src_test() {
+ emake test
+}
+
+src_install() {
+ exeinto /usr/libexec/docker/cli-plugins
+ doexe bin/build/docker-compose
+ dodoc README.md
+}
+
+pkg_postinst() {
+ ewarn
+ ewarn "docker-compose 2.x is a sub command of docker"
+ ewarn "Use 'docker compose' from the command line instead of"
+ ewarn "'docker-compose'"
+ ewarn "If you need to keep 1.x around, please run the following"
+ ewarn "command before your next --depclean"
+ ewarn "# emerge --noreplace docker-compose:0"
+}
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2023-08-11 16:06 William Hubbs
0 siblings, 0 replies; 47+ messages in thread
From: William Hubbs @ 2023-08-11 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 22511825e8f18a1e46b368ca117865588b450294
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 11 16:04:20 2023 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Aug 11 16:06:20 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22511825
app-containers/docker-compose: add 2.20.3
Closes: https://bugs.gentoo.org/912039
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
app-containers/docker-compose/Manifest | 2 +
.../docker-compose/docker-compose-2.20.3.ebuild | 50 ++++++++++++++++++++++
2 files changed, 52 insertions(+)
diff --git a/app-containers/docker-compose/Manifest b/app-containers/docker-compose/Manifest
index 77046f628f2a..6819e918afa8 100644
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@@ -3,3 +3,5 @@ DIST docker-compose-2.17.2-deps.tar.xz 194695756 BLAKE2B 2a0ce1c41d09186f36ea4a9
DIST docker-compose-2.17.2.tar.gz 310664 BLAKE2B bb36afe02b85dd4f64e6eefdb542cc954e03c11f5f3b39bcd5d84b8b4ea87218e222a89a9f20aa2b6e89afc6edd0e7ef68ccc98cbe4e26be5fe2a07f189ea07e SHA512 e0afb5ac5867f3fbe4c3216710f6f529832310e69cc8943f47d6e67fbbcc7c7541a589f6b42eed54c0415c10851dd635c0b73c4ca31dd0969c6bf68de2b40b8b
DIST docker-compose-2.20.2-deps.tar.xz 182125748 BLAKE2B 0e388c6f1e67f2e7e3048e89806c72fbcc25ec3641dfe7317c40c84afff4bed85bca472ca3906244a3bcd942794b38d59160cb0e0b478aa7e032f66e63629db4 SHA512 cd7f796ff90d504f0f52092b46120ce88cc0b274caa41bd48d481fab0872505238026e4036e6e929885c9de1c5906d345001a19038281e87386d972082bf974c
DIST docker-compose-2.20.2.tar.gz 328019 BLAKE2B 0de19af3909dff4e5eadbb137969dbbcd46d7ff4d43076aae3e524567ebf49f5351cab9fca2fd1e4abd22d58483998d0444ade9c3a372f79a69fb234b8786c42 SHA512 8b8ccece806edfaffef497ed8b8b64c6050aa35363e350a14b5a257c9230ed5656a0e5661ce6c314c2911b438780421f71714477a83e2e64db2cf6c921f86af1
+DIST docker-compose-2.20.3-deps.tar.xz 182138348 BLAKE2B db61f405421b609ef68a667909441938b79b9f565bbace1c5dcdc5c8fc26ea60a8f00dbcbe03b1f0d7c7f0e3f2c0f900f9cfc9b0d4cf98527082ce3800811ba5 SHA512 84b898d298cbcea06bffe88139321aebc6a0be2f58478d0c255e48d9a1e3e12b1ee17104adf53911a4233fc8ec3bb51a75b2d1380cd34c65e3bdb8dba3892ed8
+DIST docker-compose-2.20.3.tar.gz 336432 BLAKE2B c4c5c26e722b081363d0c28cb49483393ad3c8abdfddab6f3054997bd3389c4db92aa6698f205b990d976759f14143706a949db9ee69dc20953e1270525d3eb9 SHA512 d533318bbe550568a2c5bd43c6fa6d1d9b3887f09b6d75f278687dc28d23c4863c618599a816b7789a19182acaf869b6785c4bfc3a9b26d6329f1ac97b8059cf
diff --git a/app-containers/docker-compose/docker-compose-2.20.3.ebuild b/app-containers/docker-compose/docker-compose-2.20.3.ebuild
new file mode 100644
index 000000000000..a47ff4eb91c7
--- /dev/null
+++ b/app-containers/docker-compose/docker-compose-2.20.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2018-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND=">=app-containers/docker-cli-23.0.0"
+
+RESTRICT="test"
+S="${WORKDIR}/compose-${MY_PV}"
+
+src_prepare() {
+ default
+ # do not strip
+ sed -i -e 's/-s -w//' Makefile || die
+}
+
+src_compile() {
+ emake VERSION=v${PV}
+}
+
+src_test() {
+ emake test
+}
+
+src_install() {
+ exeinto /usr/libexec/docker/cli-plugins
+ doexe bin/build/docker-compose
+ dodoc README.md
+}
+
+pkg_postinst() {
+ ewarn
+ ewarn "docker-compose 2.x is a sub command of docker"
+ ewarn "Use 'docker compose' from the command line instead of"
+ ewarn "'docker-compose'"
+ ewarn "If you need to keep 1.x around, please run the following"
+ ewarn "command before your next --depclean"
+ ewarn "# emerge --noreplace docker-compose:0"
+}
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2023-08-11 16:06 William Hubbs
0 siblings, 0 replies; 47+ messages in thread
From: William Hubbs @ 2023-08-11 16:06 UTC (permalink / raw
To: gentoo-commits
commit: 5195c316572ebb646dd2abe9d283242c28e637ce
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 11 16:06:06 2023 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Aug 11 16:06:20 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5195c316
app-containers/docker-compose: drop 2.20.2
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
app-containers/docker-compose/Manifest | 2 -
.../docker-compose/docker-compose-2.20.2.ebuild | 50 ----------------------
2 files changed, 52 deletions(-)
diff --git a/app-containers/docker-compose/Manifest b/app-containers/docker-compose/Manifest
index 6819e918afa8..d08d70aca5e5 100644
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@@ -1,7 +1,5 @@
DIST docker-compose-1.29.2.gh.tar.gz 320320 BLAKE2B 2d1a6375127fa09661822f7148665161b45bbd234c93444ae31c1d926513fcbc9fb845f8af01d8f11788f24b7517bff5f6cea2a5da9ade897891f2dd728f26bd SHA512 09f2ae2ae7a17ab5fb3e22580f7a80f1a8253f7ad9fc8f29aca432911bcde46ed22030ff3073cdd7eff3d55aaba17f56e628a178ec05c3a9b4f28495d6045111
DIST docker-compose-2.17.2-deps.tar.xz 194695756 BLAKE2B 2a0ce1c41d09186f36ea4a935977a35edd80d013b6face813ac9622345ffa1ed8e090537ad990c4ee488ecccfe0575f92bb17f8baa0b8dc2104f75d18fac3877 SHA512 4649405eb0e49641265e514ef89cdae47806958611014ab9a9479848e857d85a5c3352ab44ff9ec39af1ca6fab67b6a2ae6c457d44690c1c1bcc3824aeb6fc07
DIST docker-compose-2.17.2.tar.gz 310664 BLAKE2B bb36afe02b85dd4f64e6eefdb542cc954e03c11f5f3b39bcd5d84b8b4ea87218e222a89a9f20aa2b6e89afc6edd0e7ef68ccc98cbe4e26be5fe2a07f189ea07e SHA512 e0afb5ac5867f3fbe4c3216710f6f529832310e69cc8943f47d6e67fbbcc7c7541a589f6b42eed54c0415c10851dd635c0b73c4ca31dd0969c6bf68de2b40b8b
-DIST docker-compose-2.20.2-deps.tar.xz 182125748 BLAKE2B 0e388c6f1e67f2e7e3048e89806c72fbcc25ec3641dfe7317c40c84afff4bed85bca472ca3906244a3bcd942794b38d59160cb0e0b478aa7e032f66e63629db4 SHA512 cd7f796ff90d504f0f52092b46120ce88cc0b274caa41bd48d481fab0872505238026e4036e6e929885c9de1c5906d345001a19038281e87386d972082bf974c
-DIST docker-compose-2.20.2.tar.gz 328019 BLAKE2B 0de19af3909dff4e5eadbb137969dbbcd46d7ff4d43076aae3e524567ebf49f5351cab9fca2fd1e4abd22d58483998d0444ade9c3a372f79a69fb234b8786c42 SHA512 8b8ccece806edfaffef497ed8b8b64c6050aa35363e350a14b5a257c9230ed5656a0e5661ce6c314c2911b438780421f71714477a83e2e64db2cf6c921f86af1
DIST docker-compose-2.20.3-deps.tar.xz 182138348 BLAKE2B db61f405421b609ef68a667909441938b79b9f565bbace1c5dcdc5c8fc26ea60a8f00dbcbe03b1f0d7c7f0e3f2c0f900f9cfc9b0d4cf98527082ce3800811ba5 SHA512 84b898d298cbcea06bffe88139321aebc6a0be2f58478d0c255e48d9a1e3e12b1ee17104adf53911a4233fc8ec3bb51a75b2d1380cd34c65e3bdb8dba3892ed8
DIST docker-compose-2.20.3.tar.gz 336432 BLAKE2B c4c5c26e722b081363d0c28cb49483393ad3c8abdfddab6f3054997bd3389c4db92aa6698f205b990d976759f14143706a949db9ee69dc20953e1270525d3eb9 SHA512 d533318bbe550568a2c5bd43c6fa6d1d9b3887f09b6d75f278687dc28d23c4863c618599a816b7789a19182acaf869b6785c4bfc3a9b26d6329f1ac97b8059cf
diff --git a/app-containers/docker-compose/docker-compose-2.20.2.ebuild b/app-containers/docker-compose/docker-compose-2.20.2.ebuild
deleted file mode 100644
index a47ff4eb91c7..000000000000
--- a/app-containers/docker-compose/docker-compose-2.20.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2018-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module
-MY_PV=${PV/_/-}
-
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://github.com/docker/compose"
-SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND=">=app-containers/docker-cli-23.0.0"
-
-RESTRICT="test"
-S="${WORKDIR}/compose-${MY_PV}"
-
-src_prepare() {
- default
- # do not strip
- sed -i -e 's/-s -w//' Makefile || die
-}
-
-src_compile() {
- emake VERSION=v${PV}
-}
-
-src_test() {
- emake test
-}
-
-src_install() {
- exeinto /usr/libexec/docker/cli-plugins
- doexe bin/build/docker-compose
- dodoc README.md
-}
-
-pkg_postinst() {
- ewarn
- ewarn "docker-compose 2.x is a sub command of docker"
- ewarn "Use 'docker compose' from the command line instead of"
- ewarn "'docker-compose'"
- ewarn "If you need to keep 1.x around, please run the following"
- ewarn "command before your next --depclean"
- ewarn "# emerge --noreplace docker-compose:0"
-}
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2023-08-13 3:21 William Hubbs
0 siblings, 0 replies; 47+ messages in thread
From: William Hubbs @ 2023-08-13 3:21 UTC (permalink / raw
To: gentoo-commits
commit: 43a11fff44d0810621fb69ca568ce90bf4161f7e
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 13 03:19:58 2023 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Aug 13 03:20:12 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43a11fff
app-containers/docker-compose: stabilize 2.20.3 for amd64, #912156
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
app-containers/docker-compose/docker-compose-2.20.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-containers/docker-compose/docker-compose-2.20.3.ebuild b/app-containers/docker-compose/docker-compose-2.20.3.ebuild
index a47ff4eb91c7..771a864f5643 100644
--- a/app-containers/docker-compose/docker-compose-2.20.3.ebuild
+++ b/app-containers/docker-compose/docker-compose-2.20.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
RDEPEND=">=app-containers/docker-cli-23.0.0"
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2023-08-13 4:58 Sam James
0 siblings, 0 replies; 47+ messages in thread
From: Sam James @ 2023-08-13 4:58 UTC (permalink / raw
To: gentoo-commits
commit: 467c9fa4e076014c8c7cc145a1ba6ddc6dca4d8e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 13 04:57:54 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Aug 13 04:57:54 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=467c9fa4
app-containers/docker-compose: Stabilize 2.20.3 arm64, #912201
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-containers/docker-compose/docker-compose-2.20.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-containers/docker-compose/docker-compose-2.20.3.ebuild b/app-containers/docker-compose/docker-compose-2.20.3.ebuild
index 771a864f5643..d2cc28a60ea6 100644
--- a/app-containers/docker-compose/docker-compose-2.20.3.ebuild
+++ b/app-containers/docker-compose/docker-compose-2.20.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 arm64"
RDEPEND=">=app-containers/docker-cli-23.0.0"
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2023-10-26 19:55 William Hubbs
0 siblings, 0 replies; 47+ messages in thread
From: William Hubbs @ 2023-10-26 19:55 UTC (permalink / raw
To: gentoo-commits
commit: bcd7f0dd6d4ce5febfb7728f08bc18b5dff8da67
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 23 17:51:59 2023 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Oct 26 19:54:22 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcd7f0dd
app-containers/docker-compose: add 2.23.0
Closes: https://bugs.gentoo.org/916059
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
app-containers/docker-compose/Manifest | 2 +
.../docker-compose/docker-compose-2.23.0.ebuild | 50 ++++++++++++++++++++++
2 files changed, 52 insertions(+)
diff --git a/app-containers/docker-compose/Manifest b/app-containers/docker-compose/Manifest
index d08d70aca5e5..12c672638985 100644
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@@ -3,3 +3,5 @@ DIST docker-compose-2.17.2-deps.tar.xz 194695756 BLAKE2B 2a0ce1c41d09186f36ea4a9
DIST docker-compose-2.17.2.tar.gz 310664 BLAKE2B bb36afe02b85dd4f64e6eefdb542cc954e03c11f5f3b39bcd5d84b8b4ea87218e222a89a9f20aa2b6e89afc6edd0e7ef68ccc98cbe4e26be5fe2a07f189ea07e SHA512 e0afb5ac5867f3fbe4c3216710f6f529832310e69cc8943f47d6e67fbbcc7c7541a589f6b42eed54c0415c10851dd635c0b73c4ca31dd0969c6bf68de2b40b8b
DIST docker-compose-2.20.3-deps.tar.xz 182138348 BLAKE2B db61f405421b609ef68a667909441938b79b9f565bbace1c5dcdc5c8fc26ea60a8f00dbcbe03b1f0d7c7f0e3f2c0f900f9cfc9b0d4cf98527082ce3800811ba5 SHA512 84b898d298cbcea06bffe88139321aebc6a0be2f58478d0c255e48d9a1e3e12b1ee17104adf53911a4233fc8ec3bb51a75b2d1380cd34c65e3bdb8dba3892ed8
DIST docker-compose-2.20.3.tar.gz 336432 BLAKE2B c4c5c26e722b081363d0c28cb49483393ad3c8abdfddab6f3054997bd3389c4db92aa6698f205b990d976759f14143706a949db9ee69dc20953e1270525d3eb9 SHA512 d533318bbe550568a2c5bd43c6fa6d1d9b3887f09b6d75f278687dc28d23c4863c618599a816b7789a19182acaf869b6785c4bfc3a9b26d6329f1ac97b8059cf
+DIST docker-compose-2.23.0-deps.tar.xz 163606408 BLAKE2B 56c60b81d7efd273309b71359f6286a546054db7d56851ba2a6b48c201e32c32fc596ec9e2f31f33988a45190f19a871fd28d3c639a35d1489511a7dda39984c SHA512 a1ed81259df7d84cb5fcb377ac7cd8d8f4b1b56b9c5006c1aa257d6f7834efc1fa69dfc6b50d4813dc89439d308573271d7c5c4115761d13083164080fae49b8
+DIST docker-compose-2.23.0.tar.gz 343649 BLAKE2B 687f4aed8a4fa4edfb92b36a21210fec29d95fc441d5aee93f47b3f42b883f84b929fc72e0243e7816292ff51354aaa543069628de1a369d7f9832d64a0a1e73 SHA512 c6bb3041f8bc23ecf9932fdc1d0c88283848026083b1854770506fee7f1dbec2f605e6eaf159705ab8ed3f1b9669b8474addac61564b37aff84ea994abb88f4e
diff --git a/app-containers/docker-compose/docker-compose-2.23.0.ebuild b/app-containers/docker-compose/docker-compose-2.23.0.ebuild
new file mode 100644
index 000000000000..a47ff4eb91c7
--- /dev/null
+++ b/app-containers/docker-compose/docker-compose-2.23.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2018-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND=">=app-containers/docker-cli-23.0.0"
+
+RESTRICT="test"
+S="${WORKDIR}/compose-${MY_PV}"
+
+src_prepare() {
+ default
+ # do not strip
+ sed -i -e 's/-s -w//' Makefile || die
+}
+
+src_compile() {
+ emake VERSION=v${PV}
+}
+
+src_test() {
+ emake test
+}
+
+src_install() {
+ exeinto /usr/libexec/docker/cli-plugins
+ doexe bin/build/docker-compose
+ dodoc README.md
+}
+
+pkg_postinst() {
+ ewarn
+ ewarn "docker-compose 2.x is a sub command of docker"
+ ewarn "Use 'docker compose' from the command line instead of"
+ ewarn "'docker-compose'"
+ ewarn "If you need to keep 1.x around, please run the following"
+ ewarn "command before your next --depclean"
+ ewarn "# emerge --noreplace docker-compose:0"
+}
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2023-11-05 19:35 Sebastian Pipping
0 siblings, 0 replies; 47+ messages in thread
From: Sebastian Pipping @ 2023-11-05 19:35 UTC (permalink / raw
To: gentoo-commits
commit: 1cd90d0134d82155be9b5a39339c6e3be60ec7aa
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 5 19:27:36 2023 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Nov 5 19:30:51 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cd90d01
app-containers/docker-compose: Address UnusedInherits + PythonGHDistfileSuffix
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
app-containers/docker-compose/Manifest | 6 +++---
app-containers/docker-compose/docker-compose-2.17.2.ebuild | 4 ++--
app-containers/docker-compose/docker-compose-2.20.3.ebuild | 4 ++--
app-containers/docker-compose/docker-compose-2.23.0.ebuild | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/app-containers/docker-compose/Manifest b/app-containers/docker-compose/Manifest
index 12c672638985..b3a14c9bc8a4 100644
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@@ -1,7 +1,7 @@
DIST docker-compose-1.29.2.gh.tar.gz 320320 BLAKE2B 2d1a6375127fa09661822f7148665161b45bbd234c93444ae31c1d926513fcbc9fb845f8af01d8f11788f24b7517bff5f6cea2a5da9ade897891f2dd728f26bd SHA512 09f2ae2ae7a17ab5fb3e22580f7a80f1a8253f7ad9fc8f29aca432911bcde46ed22030ff3073cdd7eff3d55aaba17f56e628a178ec05c3a9b4f28495d6045111
DIST docker-compose-2.17.2-deps.tar.xz 194695756 BLAKE2B 2a0ce1c41d09186f36ea4a935977a35edd80d013b6face813ac9622345ffa1ed8e090537ad990c4ee488ecccfe0575f92bb17f8baa0b8dc2104f75d18fac3877 SHA512 4649405eb0e49641265e514ef89cdae47806958611014ab9a9479848e857d85a5c3352ab44ff9ec39af1ca6fab67b6a2ae6c457d44690c1c1bcc3824aeb6fc07
-DIST docker-compose-2.17.2.tar.gz 310664 BLAKE2B bb36afe02b85dd4f64e6eefdb542cc954e03c11f5f3b39bcd5d84b8b4ea87218e222a89a9f20aa2b6e89afc6edd0e7ef68ccc98cbe4e26be5fe2a07f189ea07e SHA512 e0afb5ac5867f3fbe4c3216710f6f529832310e69cc8943f47d6e67fbbcc7c7541a589f6b42eed54c0415c10851dd635c0b73c4ca31dd0969c6bf68de2b40b8b
+DIST docker-compose-2.17.2.gh.tar.gz 310664 BLAKE2B bb36afe02b85dd4f64e6eefdb542cc954e03c11f5f3b39bcd5d84b8b4ea87218e222a89a9f20aa2b6e89afc6edd0e7ef68ccc98cbe4e26be5fe2a07f189ea07e SHA512 e0afb5ac5867f3fbe4c3216710f6f529832310e69cc8943f47d6e67fbbcc7c7541a589f6b42eed54c0415c10851dd635c0b73c4ca31dd0969c6bf68de2b40b8b
DIST docker-compose-2.20.3-deps.tar.xz 182138348 BLAKE2B db61f405421b609ef68a667909441938b79b9f565bbace1c5dcdc5c8fc26ea60a8f00dbcbe03b1f0d7c7f0e3f2c0f900f9cfc9b0d4cf98527082ce3800811ba5 SHA512 84b898d298cbcea06bffe88139321aebc6a0be2f58478d0c255e48d9a1e3e12b1ee17104adf53911a4233fc8ec3bb51a75b2d1380cd34c65e3bdb8dba3892ed8
-DIST docker-compose-2.20.3.tar.gz 336432 BLAKE2B c4c5c26e722b081363d0c28cb49483393ad3c8abdfddab6f3054997bd3389c4db92aa6698f205b990d976759f14143706a949db9ee69dc20953e1270525d3eb9 SHA512 d533318bbe550568a2c5bd43c6fa6d1d9b3887f09b6d75f278687dc28d23c4863c618599a816b7789a19182acaf869b6785c4bfc3a9b26d6329f1ac97b8059cf
+DIST docker-compose-2.20.3.gh.tar.gz 336432 BLAKE2B c4c5c26e722b081363d0c28cb49483393ad3c8abdfddab6f3054997bd3389c4db92aa6698f205b990d976759f14143706a949db9ee69dc20953e1270525d3eb9 SHA512 d533318bbe550568a2c5bd43c6fa6d1d9b3887f09b6d75f278687dc28d23c4863c618599a816b7789a19182acaf869b6785c4bfc3a9b26d6329f1ac97b8059cf
DIST docker-compose-2.23.0-deps.tar.xz 163606408 BLAKE2B 56c60b81d7efd273309b71359f6286a546054db7d56851ba2a6b48c201e32c32fc596ec9e2f31f33988a45190f19a871fd28d3c639a35d1489511a7dda39984c SHA512 a1ed81259df7d84cb5fcb377ac7cd8d8f4b1b56b9c5006c1aa257d6f7834efc1fa69dfc6b50d4813dc89439d308573271d7c5c4115761d13083164080fae49b8
-DIST docker-compose-2.23.0.tar.gz 343649 BLAKE2B 687f4aed8a4fa4edfb92b36a21210fec29d95fc441d5aee93f47b3f42b883f84b929fc72e0243e7816292ff51354aaa543069628de1a369d7f9832d64a0a1e73 SHA512 c6bb3041f8bc23ecf9932fdc1d0c88283848026083b1854770506fee7f1dbec2f605e6eaf159705ab8ed3f1b9669b8474addac61564b37aff84ea994abb88f4e
+DIST docker-compose-2.23.0.gh.tar.gz 343649 BLAKE2B 687f4aed8a4fa4edfb92b36a21210fec29d95fc441d5aee93f47b3f42b883f84b929fc72e0243e7816292ff51354aaa543069628de1a369d7f9832d64a0a1e73 SHA512 c6bb3041f8bc23ecf9932fdc1d0c88283848026083b1854770506fee7f1dbec2f605e6eaf159705ab8ed3f1b9669b8474addac61564b37aff84ea994abb88f4e
diff --git a/app-containers/docker-compose/docker-compose-2.17.2.ebuild b/app-containers/docker-compose/docker-compose-2.17.2.ebuild
index d2cc28a60ea6..5702db996b66 100644
--- a/app-containers/docker-compose/docker-compose-2.17.2.ebuild
+++ b/app-containers/docker-compose/docker-compose-2.17.2.ebuild
@@ -2,12 +2,12 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit bash-completion-r1 go-module
+inherit go-module
MY_PV=${PV/_/-}
DESCRIPTION="Multi-container orchestration for Docker"
HOMEPAGE="https://github.com/docker/compose"
-SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
LICENSE="Apache-2.0"
diff --git a/app-containers/docker-compose/docker-compose-2.20.3.ebuild b/app-containers/docker-compose/docker-compose-2.20.3.ebuild
index d2cc28a60ea6..5702db996b66 100644
--- a/app-containers/docker-compose/docker-compose-2.20.3.ebuild
+++ b/app-containers/docker-compose/docker-compose-2.20.3.ebuild
@@ -2,12 +2,12 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit bash-completion-r1 go-module
+inherit go-module
MY_PV=${PV/_/-}
DESCRIPTION="Multi-container orchestration for Docker"
HOMEPAGE="https://github.com/docker/compose"
-SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
LICENSE="Apache-2.0"
diff --git a/app-containers/docker-compose/docker-compose-2.23.0.ebuild b/app-containers/docker-compose/docker-compose-2.23.0.ebuild
index a47ff4eb91c7..21ce13765326 100644
--- a/app-containers/docker-compose/docker-compose-2.23.0.ebuild
+++ b/app-containers/docker-compose/docker-compose-2.23.0.ebuild
@@ -2,12 +2,12 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit bash-completion-r1 go-module
+inherit go-module
MY_PV=${PV/_/-}
DESCRIPTION="Multi-container orchestration for Docker"
HOMEPAGE="https://github.com/docker/compose"
-SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
LICENSE="Apache-2.0"
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2023-11-05 19:35 Sebastian Pipping
0 siblings, 0 replies; 47+ messages in thread
From: Sebastian Pipping @ 2023-11-05 19:35 UTC (permalink / raw
To: gentoo-commits
commit: 07546f31877d1f36254e1bb2e5eaf693a360be81
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 5 19:33:46 2023 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Nov 5 19:33:46 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07546f31
app-containers/docker-compose: Drop old 1.x.x
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
.../docker-compose/docker-compose-1.29.2-r1.ebuild | 71 ---------------------
.../docker-compose/docker-compose-1.29.2-r2.ebuild | 72 ----------------------
2 files changed, 143 deletions(-)
diff --git a/app-containers/docker-compose/docker-compose-1.29.2-r1.ebuild b/app-containers/docker-compose/docker-compose-1.29.2-r1.ebuild
deleted file mode 100644
index 7d8e5af2aa6a..000000000000
--- a/app-containers/docker-compose/docker-compose-1.29.2-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 2018-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit bash-completion-r1 distutils-r1
-
-MY_PV=${PV/_/-}
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://github.com/docker/compose"
-SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64"
-
-RDEPEND="
- >=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
- >=dev-python/docker-5[${PYTHON_USEDEP}]
- >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
- >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
- >=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}]
- >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
- dev-python/paramiko[${PYTHON_USEDEP}]
- >=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
- >=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
- >=dev-python/six-1.3.0[${PYTHON_USEDEP}]
- >=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
- >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
- test? (
- >=dev-python/pytest-5[${PYTHON_USEDEP}]
- >=dev-python/ddt-1.2.2[${PYTHON_USEDEP}]
- )"
-
-S="${WORKDIR}/compose-${MY_PV}"
-
-distutils_enable_tests pytest
-
-PATCHES=(
- # Bug #679968 -- https://bugs.gentoo.org/679968
- # Bug #681002 -- https://bugs.gentoo.org/681002
- "${FILESDIR}"/${PN}-1.29.0-setup-py.patch
-)
-
-DOCS=( CHANGELOG.md README.md )
-
-src_prepare() {
- # Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
- sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
-
- default
-}
-
-python_test() {
- distutils_install_for_testing
- epytest tests/unit/
-}
-
-python_install_all() {
- newbashcomp contrib/completion/bash/docker-compose ${PN}
-
- insinto /usr/share/zsh/site-functions
- doins contrib/completion/zsh/*
-
- distutils-r1_python_install_all
-}
diff --git a/app-containers/docker-compose/docker-compose-1.29.2-r2.ebuild b/app-containers/docker-compose/docker-compose-1.29.2-r2.ebuild
deleted file mode 100644
index bcff35cfe706..000000000000
--- a/app-containers/docker-compose/docker-compose-1.29.2-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 2018-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit bash-completion-r1 distutils-r1
-
-MY_PV=${PV/_/-}
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://github.com/docker/compose"
-SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND="
- >=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
- >=dev-python/docker-5[${PYTHON_USEDEP}]
- >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
- >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
- >=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}]
- >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
- dev-python/paramiko[${PYTHON_USEDEP}]
- >=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
- >=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
- >=dev-python/six-1.3.0[${PYTHON_USEDEP}]
- >=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
- >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
- test? (
- >=dev-python/pytest-5[${PYTHON_USEDEP}]
- >=dev-python/ddt-1.2.2[${PYTHON_USEDEP}]
- )"
-
-S="${WORKDIR}/compose-${MY_PV}"
-
-distutils_enable_tests pytest
-
-PATCHES=(
- # Bug #679968 -- https://bugs.gentoo.org/679968
- # Bug #681002 -- https://bugs.gentoo.org/681002
- "${FILESDIR}"/${PN}-1.29.0-setup-py.patch
- "${FILESDIR}"/${P}-tests-unit-cli-test-py.patch
-)
-
-DOCS=( CHANGELOG.md README.md )
-
-src_prepare() {
- # Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
- sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
-
- default
-}
-
-python_test() {
- distutils_install_for_testing
- epytest tests/unit/
-}
-
-python_install_all() {
- newbashcomp contrib/completion/bash/docker-compose ${PN}
-
- insinto /usr/share/zsh/site-functions
- doins contrib/completion/zsh/*
-
- distutils-r1_python_install_all
-}
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2023-12-12 23:25 Sebastian Pipping
0 siblings, 0 replies; 47+ messages in thread
From: Sebastian Pipping @ 2023-12-12 23:25 UTC (permalink / raw
To: gentoo-commits
commit: 2389f4df09e45b5dc1984f3677173ba0fbc0706a
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 12 23:19:44 2023 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Tue Dec 12 23:25:35 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2389f4df
app-containers/docker-compose: Protect 1.x.x from >=dev-python/docker-7.0.0
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild | 2 +-
...{docker-compose-1.29.2-r4.ebuild => docker-compose-1.29.2-r5.ebuild} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild b/app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild
index 39eb140045cd..ee0767eba707 100644
--- a/app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild
+++ b/app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="amd64 arm64"
RDEPEND="
>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
- >=dev-python/docker-5[${PYTHON_USEDEP}]
+ <dev-python/docker-7[${PYTHON_USEDEP}]
>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
>=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}]
diff --git a/app-containers/docker-compose/docker-compose-1.29.2-r4.ebuild b/app-containers/docker-compose/docker-compose-1.29.2-r5.ebuild
similarity index 97%
rename from app-containers/docker-compose/docker-compose-1.29.2-r4.ebuild
rename to app-containers/docker-compose/docker-compose-1.29.2-r5.ebuild
index 6512e3b8ce7f..65f0ca25d5a4 100644
--- a/app-containers/docker-compose/docker-compose-1.29.2-r4.ebuild
+++ b/app-containers/docker-compose/docker-compose-1.29.2-r5.ebuild
@@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~arm64"
RDEPEND="
>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
- >=dev-python/docker-5[${PYTHON_USEDEP}]
+ <dev-python/docker-7[${PYTHON_USEDEP}]
>=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
>=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}]
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2024-01-11 18:26 William Hubbs
0 siblings, 0 replies; 47+ messages in thread
From: William Hubbs @ 2024-01-11 18:26 UTC (permalink / raw
To: gentoo-commits
commit: 7ae29937b83da8adc0190462620aff55e7e554af
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 11 18:24:02 2024 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Jan 11 18:26:34 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ae29937
app-containers/docker-compose: 2.23.x requires >= go 1.21
Closes: https://bugs.gentoo.org/917607
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
app-containers/docker-compose/docker-compose-2.23.0.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/app-containers/docker-compose/docker-compose-2.23.0.ebuild b/app-containers/docker-compose/docker-compose-2.23.0.ebuild
index 21ce13765326..f306d5212cc7 100644
--- a/app-containers/docker-compose/docker-compose-2.23.0.ebuild
+++ b/app-containers/docker-compose/docker-compose-2.23.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018-2023 Gentoo Authors
+# Copyright 2018-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -14,6 +14,7 @@ LICENSE="Apache-2.0"
SLOT="2"
KEYWORDS="~amd64 ~arm64"
+BDEPEND=">=dev-lang/go-1.21"
RDEPEND=">=app-containers/docker-cli-23.0.0"
RESTRICT="test"
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2024-01-11 18:35 William Hubbs
0 siblings, 0 replies; 47+ messages in thread
From: William Hubbs @ 2024-01-11 18:35 UTC (permalink / raw
To: gentoo-commits
commit: 9ad320c9ea1d02473871c4f852a1d1a5ef731323
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 11 18:34:57 2024 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Jan 11 18:35:05 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ad320c9
app-containers/docker-compose: add 2.24.0
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
app-containers/docker-compose/Manifest | 2 +
.../docker-compose/docker-compose-2.24.0.ebuild | 51 ++++++++++++++++++++++
2 files changed, 53 insertions(+)
diff --git a/app-containers/docker-compose/Manifest b/app-containers/docker-compose/Manifest
index b3a14c9bc8a4..4ce1ac78a6d7 100644
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@@ -5,3 +5,5 @@ DIST docker-compose-2.20.3-deps.tar.xz 182138348 BLAKE2B db61f405421b609ef68a667
DIST docker-compose-2.20.3.gh.tar.gz 336432 BLAKE2B c4c5c26e722b081363d0c28cb49483393ad3c8abdfddab6f3054997bd3389c4db92aa6698f205b990d976759f14143706a949db9ee69dc20953e1270525d3eb9 SHA512 d533318bbe550568a2c5bd43c6fa6d1d9b3887f09b6d75f278687dc28d23c4863c618599a816b7789a19182acaf869b6785c4bfc3a9b26d6329f1ac97b8059cf
DIST docker-compose-2.23.0-deps.tar.xz 163606408 BLAKE2B 56c60b81d7efd273309b71359f6286a546054db7d56851ba2a6b48c201e32c32fc596ec9e2f31f33988a45190f19a871fd28d3c639a35d1489511a7dda39984c SHA512 a1ed81259df7d84cb5fcb377ac7cd8d8f4b1b56b9c5006c1aa257d6f7834efc1fa69dfc6b50d4813dc89439d308573271d7c5c4115761d13083164080fae49b8
DIST docker-compose-2.23.0.gh.tar.gz 343649 BLAKE2B 687f4aed8a4fa4edfb92b36a21210fec29d95fc441d5aee93f47b3f42b883f84b929fc72e0243e7816292ff51354aaa543069628de1a369d7f9832d64a0a1e73 SHA512 c6bb3041f8bc23ecf9932fdc1d0c88283848026083b1854770506fee7f1dbec2f605e6eaf159705ab8ed3f1b9669b8474addac61564b37aff84ea994abb88f4e
+DIST docker-compose-2.24.0-deps.tar.xz 165907064 BLAKE2B 22b760393edc5a17bee52c6ccd5f227e724aaee32eb92113898e2f01727ff8913f98e2dba2f1f43277feffa9332888d64ef24b7fb9eb0f90f5038d711271b66a SHA512 2446cd56c69cc8cf1908ef2fd76e969bbd9a743f0b75d25e6c99304a203951a3196d8b8a9a4052560fb4923d20be8023452f051c3c3215e38007a7c6173489c9
+DIST docker-compose-2.24.0.gh.tar.gz 344571 BLAKE2B 4d79bf83b0584b8ed56c6f573798f8ed6fe264ffbfc870e9fbe6b79ba4c61248a6e139ebbbd0cd80b9ad607b5c71901ebb19b04e7b6c3e4cbbe8806d0a174eed SHA512 78e5d6ad6f00c4c4a5878b8231ab538bdc9a1d1df17fe1b5aca7bb3a4358897bd6742f8075c54fc00de8bccf5e9f6529acceb57ae221c0794b6c5b0e655b8771
diff --git a/app-containers/docker-compose/docker-compose-2.24.0.ebuild b/app-containers/docker-compose/docker-compose-2.24.0.ebuild
new file mode 100644
index 000000000000..f306d5212cc7
--- /dev/null
+++ b/app-containers/docker-compose/docker-compose-2.24.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2018-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm64"
+
+BDEPEND=">=dev-lang/go-1.21"
+RDEPEND=">=app-containers/docker-cli-23.0.0"
+
+RESTRICT="test"
+S="${WORKDIR}/compose-${MY_PV}"
+
+src_prepare() {
+ default
+ # do not strip
+ sed -i -e 's/-s -w//' Makefile || die
+}
+
+src_compile() {
+ emake VERSION=v${PV}
+}
+
+src_test() {
+ emake test
+}
+
+src_install() {
+ exeinto /usr/libexec/docker/cli-plugins
+ doexe bin/build/docker-compose
+ dodoc README.md
+}
+
+pkg_postinst() {
+ ewarn
+ ewarn "docker-compose 2.x is a sub command of docker"
+ ewarn "Use 'docker compose' from the command line instead of"
+ ewarn "'docker-compose'"
+ ewarn "If you need to keep 1.x around, please run the following"
+ ewarn "command before your next --depclean"
+ ewarn "# emerge --noreplace docker-compose:0"
+}
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2024-03-22 18:26 Sam James
0 siblings, 0 replies; 47+ messages in thread
From: Sam James @ 2024-03-22 18:26 UTC (permalink / raw
To: gentoo-commits
commit: 9ce2561b9a8d1de86950e7a95b8b0ae6bc30bc0d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 18:26:03 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 18:26:03 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ce2561b
app-containers/docker-compose: Stabilize 1.29.2-r6 arm64, #927546
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-containers/docker-compose/docker-compose-1.29.2-r6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-containers/docker-compose/docker-compose-1.29.2-r6.ebuild b/app-containers/docker-compose/docker-compose-1.29.2-r6.ebuild
index 091c48dd7db2..db06f6aaf173 100644
--- a/app-containers/docker-compose/docker-compose-1.29.2-r6.ebuild
+++ b/app-containers/docker-compose/docker-compose-1.29.2-r6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.gh.ta
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 arm64"
RDEPEND="
>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2024-03-22 20:23 Arthur Zamarin
0 siblings, 0 replies; 47+ messages in thread
From: Arthur Zamarin @ 2024-03-22 20:23 UTC (permalink / raw
To: gentoo-commits
commit: 1c6e4d28fba84573918ba5635ad1357e9ca465c7
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 20:23:18 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 20:23:18 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c6e4d28
app-containers/docker-compose: Stabilize 1.29.2-r6 amd64, #927546
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
app-containers/docker-compose/docker-compose-1.29.2-r6.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-containers/docker-compose/docker-compose-1.29.2-r6.ebuild b/app-containers/docker-compose/docker-compose-1.29.2-r6.ebuild
index db06f6aaf173..cb09144e9979 100644
--- a/app-containers/docker-compose/docker-compose-1.29.2-r6.ebuild
+++ b/app-containers/docker-compose/docker-compose-1.29.2-r6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.gh.ta
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 arm64"
+KEYWORDS="amd64 arm64"
RDEPEND="
>=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2024-04-12 15:49 William Hubbs
0 siblings, 0 replies; 47+ messages in thread
From: William Hubbs @ 2024-04-12 15:49 UTC (permalink / raw
To: gentoo-commits
commit: 1eea9a8eae58d9e6542a69408288983a0dfb102f
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 12 15:49:17 2024 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Apr 12 15:49:42 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eea9a8e
app-containers/docker-compose: add 2.26.1
Closes: https://bugs.gentoo.org/929032
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
app-containers/docker-compose/Manifest | 2 +
.../docker-compose/docker-compose-2.26.1.ebuild | 51 ++++++++++++++++++++++
2 files changed, 53 insertions(+)
diff --git a/app-containers/docker-compose/Manifest b/app-containers/docker-compose/Manifest
index 4ce1ac78a6d7..acdcd8a78aa7 100644
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@@ -7,3 +7,5 @@ DIST docker-compose-2.23.0-deps.tar.xz 163606408 BLAKE2B 56c60b81d7efd273309b713
DIST docker-compose-2.23.0.gh.tar.gz 343649 BLAKE2B 687f4aed8a4fa4edfb92b36a21210fec29d95fc441d5aee93f47b3f42b883f84b929fc72e0243e7816292ff51354aaa543069628de1a369d7f9832d64a0a1e73 SHA512 c6bb3041f8bc23ecf9932fdc1d0c88283848026083b1854770506fee7f1dbec2f605e6eaf159705ab8ed3f1b9669b8474addac61564b37aff84ea994abb88f4e
DIST docker-compose-2.24.0-deps.tar.xz 165907064 BLAKE2B 22b760393edc5a17bee52c6ccd5f227e724aaee32eb92113898e2f01727ff8913f98e2dba2f1f43277feffa9332888d64ef24b7fb9eb0f90f5038d711271b66a SHA512 2446cd56c69cc8cf1908ef2fd76e969bbd9a743f0b75d25e6c99304a203951a3196d8b8a9a4052560fb4923d20be8023452f051c3c3215e38007a7c6173489c9
DIST docker-compose-2.24.0.gh.tar.gz 344571 BLAKE2B 4d79bf83b0584b8ed56c6f573798f8ed6fe264ffbfc870e9fbe6b79ba4c61248a6e139ebbbd0cd80b9ad607b5c71901ebb19b04e7b6c3e4cbbe8806d0a174eed SHA512 78e5d6ad6f00c4c4a5878b8231ab538bdc9a1d1df17fe1b5aca7bb3a4358897bd6742f8075c54fc00de8bccf5e9f6529acceb57ae221c0794b6c5b0e655b8771
+DIST docker-compose-2.26.1-deps.tar.xz 66292916 BLAKE2B 011026d25674981860ecdf37d598d1caa53394044c06dc335a8579d6f39d295d6f8304cada20b3f7f1691c680f32b998a4421ca4ac863d7eee186ad81c6cddfa SHA512 9834df136fd013e36481c1c88b63b945abff6d1183091a70affbea99e2d96681edcf6ec8cf0c95ec35d9ea9236ff4f9f8f2995ca80d069646edcc92555792f4f
+DIST docker-compose-2.26.1.gh.tar.gz 361194 BLAKE2B 464afc0f4d41165b97c1c35f2fcf57916ea8e7da367b43c7efb0d863416ae3b13a243f56dd2261eec0f3c7465999ce5505bb62a2bc61c1e80998c2bacec905c5 SHA512 4a97326c6ed974400aca91a64e93ef0e1fa6b52f988f636b8bbcb43e14442c6702e2d42afda3e491a9da18176448f342ebae7212bf59617372295d831beb8aba
diff --git a/app-containers/docker-compose/docker-compose-2.26.1.ebuild b/app-containers/docker-compose/docker-compose-2.26.1.ebuild
new file mode 100644
index 000000000000..f306d5212cc7
--- /dev/null
+++ b/app-containers/docker-compose/docker-compose-2.26.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2018-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm64"
+
+BDEPEND=">=dev-lang/go-1.21"
+RDEPEND=">=app-containers/docker-cli-23.0.0"
+
+RESTRICT="test"
+S="${WORKDIR}/compose-${MY_PV}"
+
+src_prepare() {
+ default
+ # do not strip
+ sed -i -e 's/-s -w//' Makefile || die
+}
+
+src_compile() {
+ emake VERSION=v${PV}
+}
+
+src_test() {
+ emake test
+}
+
+src_install() {
+ exeinto /usr/libexec/docker/cli-plugins
+ doexe bin/build/docker-compose
+ dodoc README.md
+}
+
+pkg_postinst() {
+ ewarn
+ ewarn "docker-compose 2.x is a sub command of docker"
+ ewarn "Use 'docker compose' from the command line instead of"
+ ewarn "'docker-compose'"
+ ewarn "If you need to keep 1.x around, please run the following"
+ ewarn "command before your next --depclean"
+ ewarn "# emerge --noreplace docker-compose:0"
+}
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2024-06-14 12:26 Michał Górny
0 siblings, 0 replies; 47+ messages in thread
From: Michał Górny @ 2024-06-14 12:26 UTC (permalink / raw
To: gentoo-commits
commit: 049e44c74868d28da962550c3fd1712ab34ebbfd
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 10 19:00:17 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jun 14 12:26:11 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=049e44c7
app-containers/docker-compose: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../docker-compose/docker-compose-1.29.2-r3.ebuild | 73 ----------------------
.../docker-compose/docker-compose-1.29.2-r5.ebuild | 73 ----------------------
2 files changed, 146 deletions(-)
diff --git a/app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild b/app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild
deleted file mode 100644
index ee0767eba707..000000000000
--- a/app-containers/docker-compose/docker-compose-1.29.2-r3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 2018-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit bash-completion-r1 distutils-r1
-
-MY_PV=${PV/_/-}
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://github.com/docker/compose"
-SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64"
-
-RDEPEND="
- >=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
- <dev-python/docker-7[${PYTHON_USEDEP}]
- >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
- >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
- >=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}]
- >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
- dev-python/paramiko[${PYTHON_USEDEP}]
- >=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
- >=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
- >=dev-python/six-1.3.0[${PYTHON_USEDEP}]
- >=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
- >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
- test? (
- >=dev-python/pytest-5[${PYTHON_USEDEP}]
- >=dev-python/ddt-1.2.2[${PYTHON_USEDEP}]
- dev-python/py[${PYTHON_USEDEP}]
- )"
-
-S="${WORKDIR}/compose-${MY_PV}"
-
-distutils_enable_tests pytest
-
-PATCHES=(
- # Bug #679968 -- https://bugs.gentoo.org/679968
- # Bug #681002 -- https://bugs.gentoo.org/681002
- "${FILESDIR}"/${PN}-1.29.0-setup-py.patch
- "${FILESDIR}"/${P}-tests-unit-cli-test-py.patch
-)
-
-DOCS=( CHANGELOG.md README.md )
-
-src_prepare() {
- # Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
- sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
-
- default
-}
-
-python_test() {
- distutils_install_for_testing
- epytest tests/unit/
-}
-
-python_install_all() {
- newbashcomp contrib/completion/bash/docker-compose ${PN}
-
- insinto /usr/share/zsh/site-functions
- doins contrib/completion/zsh/*
-
- distutils-r1_python_install_all
-}
diff --git a/app-containers/docker-compose/docker-compose-1.29.2-r5.ebuild b/app-containers/docker-compose/docker-compose-1.29.2-r5.ebuild
deleted file mode 100644
index 65f0ca25d5a4..000000000000
--- a/app-containers/docker-compose/docker-compose-1.29.2-r5.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 2018-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit bash-completion-r1 distutils-r1
-
-MY_PV=${PV/_/-}
-DESCRIPTION="Multi-container orchestration for Docker"
-HOMEPAGE="https://github.com/docker/compose"
-SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-
-RDEPEND="
- >=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
- <dev-python/docker-7[${PYTHON_USEDEP}]
- >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
- >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
- >=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}]
- >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
- dev-python/paramiko[${PYTHON_USEDEP}]
- >=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
- >=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
- >=dev-python/six-1.3.0[${PYTHON_USEDEP}]
- >=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
- >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
- test? (
- >=dev-python/pytest-5[${PYTHON_USEDEP}]
- >=dev-python/ddt-1.2.2[${PYTHON_USEDEP}]
- dev-python/py[${PYTHON_USEDEP}]
- )"
-
-S="${WORKDIR}/compose-${MY_PV}"
-
-distutils_enable_tests pytest
-
-PATCHES=(
- # Bug #679968 -- https://bugs.gentoo.org/679968
- # Bug #681002 -- https://bugs.gentoo.org/681002
- "${FILESDIR}"/${PN}-1.29.0-setup-py.patch
- "${FILESDIR}"/${P}-tests-unit-cli-test-py.patch
-)
-
-DOCS=( CHANGELOG.md README.md )
-
-src_prepare() {
- # Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
- sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
-
- default
-}
-
-python_test() {
- epytest tests/unit/
-}
-
-python_install_all() {
- newbashcomp contrib/completion/bash/docker-compose ${PN}
-
- insinto /usr/share/zsh/site-functions
- doins contrib/completion/zsh/*
-
- distutils-r1_python_install_all
-}
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2024-07-02 17:52 William Hubbs
0 siblings, 0 replies; 47+ messages in thread
From: William Hubbs @ 2024-07-02 17:52 UTC (permalink / raw
To: gentoo-commits
commit: 3596fcf9f64e945b9323a7bd9e1fb6d5ac9c7ec4
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 2 13:23:31 2024 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Jul 2 17:51:23 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3596fcf9
app-containers/docker-compose: add 2.28.1
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
app-containers/docker-compose/Manifest | 2 +
.../docker-compose/docker-compose-2.28.1.ebuild | 51 ++++++++++++++++++++++
2 files changed, 53 insertions(+)
diff --git a/app-containers/docker-compose/Manifest b/app-containers/docker-compose/Manifest
index acdcd8a78aa7..1652794943e8 100644
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@@ -9,3 +9,5 @@ DIST docker-compose-2.24.0-deps.tar.xz 165907064 BLAKE2B 22b760393edc5a17bee52c6
DIST docker-compose-2.24.0.gh.tar.gz 344571 BLAKE2B 4d79bf83b0584b8ed56c6f573798f8ed6fe264ffbfc870e9fbe6b79ba4c61248a6e139ebbbd0cd80b9ad607b5c71901ebb19b04e7b6c3e4cbbe8806d0a174eed SHA512 78e5d6ad6f00c4c4a5878b8231ab538bdc9a1d1df17fe1b5aca7bb3a4358897bd6742f8075c54fc00de8bccf5e9f6529acceb57ae221c0794b6c5b0e655b8771
DIST docker-compose-2.26.1-deps.tar.xz 66292916 BLAKE2B 011026d25674981860ecdf37d598d1caa53394044c06dc335a8579d6f39d295d6f8304cada20b3f7f1691c680f32b998a4421ca4ac863d7eee186ad81c6cddfa SHA512 9834df136fd013e36481c1c88b63b945abff6d1183091a70affbea99e2d96681edcf6ec8cf0c95ec35d9ea9236ff4f9f8f2995ca80d069646edcc92555792f4f
DIST docker-compose-2.26.1.gh.tar.gz 361194 BLAKE2B 464afc0f4d41165b97c1c35f2fcf57916ea8e7da367b43c7efb0d863416ae3b13a243f56dd2261eec0f3c7465999ce5505bb62a2bc61c1e80998c2bacec905c5 SHA512 4a97326c6ed974400aca91a64e93ef0e1fa6b52f988f636b8bbcb43e14442c6702e2d42afda3e491a9da18176448f342ebae7212bf59617372295d831beb8aba
+DIST docker-compose-2.28.1-deps.tar.xz 63440736 BLAKE2B 8af853b07539a413d2532e4d851558c71a27f49679316cab86d026cbc483b6d1bc02c991d839978e60b39e459c09433d215f105e7bac031bc946d2585e275fe3 SHA512 99ef80068d28692da7da9abfbe7f19c28b62425b0cd5ce7d66698e31a40bc8625f665b261077251426577be535e8d5059ffdadbe11a05abdb3768107b5a127f2
+DIST docker-compose-2.28.1.gh.tar.gz 362304 BLAKE2B d18b6c2c5cd92aa7aaae57edd7343b5c282b0d88911b8a73393d4bdc994e4addda09b6a921bd3b0ebe370abd856b8b950ccad62ac43b29de0f8a25e3f7106269 SHA512 87e7296d42a697c477601db85d08dc11ada42ccc8e59d5b560db7bf74c27b63f9f09424949b94ec33bf17a8537d3b549fe9727933396257464ad42730736a608
diff --git a/app-containers/docker-compose/docker-compose-2.28.1.ebuild b/app-containers/docker-compose/docker-compose-2.28.1.ebuild
new file mode 100644
index 000000000000..f306d5212cc7
--- /dev/null
+++ b/app-containers/docker-compose/docker-compose-2.28.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2018-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="~amd64 ~arm64"
+
+BDEPEND=">=dev-lang/go-1.21"
+RDEPEND=">=app-containers/docker-cli-23.0.0"
+
+RESTRICT="test"
+S="${WORKDIR}/compose-${MY_PV}"
+
+src_prepare() {
+ default
+ # do not strip
+ sed -i -e 's/-s -w//' Makefile || die
+}
+
+src_compile() {
+ emake VERSION=v${PV}
+}
+
+src_test() {
+ emake test
+}
+
+src_install() {
+ exeinto /usr/libexec/docker/cli-plugins
+ doexe bin/build/docker-compose
+ dodoc README.md
+}
+
+pkg_postinst() {
+ ewarn
+ ewarn "docker-compose 2.x is a sub command of docker"
+ ewarn "Use 'docker compose' from the command line instead of"
+ ewarn "'docker-compose'"
+ ewarn "If you need to keep 1.x around, please run the following"
+ ewarn "command before your next --depclean"
+ ewarn "# emerge --noreplace docker-compose:0"
+}
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2024-09-28 10:27 Arthur Zamarin
0 siblings, 0 replies; 47+ messages in thread
From: Arthur Zamarin @ 2024-09-28 10:27 UTC (permalink / raw
To: gentoo-commits
commit: 4a8fa332584e33e10b819624e50cf2156fab14de
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 28 10:27:32 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 28 10:27:32 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a8fa332
app-containers/docker-compose: Stabilize 2.28.1 arm64, #939806
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
app-containers/docker-compose/docker-compose-2.28.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-containers/docker-compose/docker-compose-2.28.1.ebuild b/app-containers/docker-compose/docker-compose-2.28.1.ebuild
index 07497c442bbd..f6023d040cd4 100644
--- a/app-containers/docker-compose/docker-compose-2.28.1.ebuild
+++ b/app-containers/docker-compose/docker-compose-2.28.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="amd64 arm64"
BDEPEND=">=dev-lang/go-1.21"
RDEPEND=">=app-containers/docker-cli-23.0.0"
^ permalink raw reply related [flat|nested] 47+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/
@ 2024-10-03 17:46 Sebastian Pipping
0 siblings, 0 replies; 47+ messages in thread
From: Sebastian Pipping @ 2024-10-03 17:46 UTC (permalink / raw
To: gentoo-commits
commit: 550dbbedd217e5016b9d200b2304a6958ee91209
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 3 17:24:36 2024 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Oct 3 17:44:31 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=550dbbed
app-containers/docker-compose: Python 3.12 support for 1.x
Also address warning VariableOrderWrong about ${S}
Closes: https://bugs.gentoo.org/934519
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
.../docker-compose/docker-compose-1.29.2-r7.ebuild | 80 ++++++++++++++++++++++
1 file changed, 80 insertions(+)
diff --git a/app-containers/docker-compose/docker-compose-1.29.2-r7.ebuild b/app-containers/docker-compose/docker-compose-1.29.2-r7.ebuild
new file mode 100644
index 000000000000..57c5fd2f5d6f
--- /dev/null
+++ b/app-containers/docker-compose/docker-compose-1.29.2-r7.ebuild
@@ -0,0 +1,80 @@
+# Copyright 2018-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..12} )
+
+inherit bash-completion-r1 distutils-r1
+
+MY_PV=${PV/_/-}
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+
+S="${WORKDIR}/compose-${MY_PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+RDEPEND="
+ >=dev-python/distro-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/docker-7[${PYTHON_USEDEP}]
+ >=dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}]
+ >=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
+ >=dev-python/python-dotenv-0.13.0[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}]
+ dev-python/paramiko[${PYTHON_USEDEP}]
+ >=dev-python/PySocks-1.6.0[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+ >=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/texttable-0.9.0[${PYTHON_USEDEP}]
+ >=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}
+ test? (
+ >=dev-python/pytest-5[${PYTHON_USEDEP}]
+ >=dev-python/ddt-1.2.2[${PYTHON_USEDEP}]
+ dev-python/py[${PYTHON_USEDEP}]
+ )"
+
+EPYTEST_DESELECT=(
+ # These are not ready for >=dev-python/docker-7
+ tests/unit/cli/docker_client_test.py::TLSConfigTestCase::
+)
+
+distutils_enable_tests pytest
+
+PATCHES=(
+ # Bug #679968 -- https://bugs.gentoo.org/679968
+ # Bug #681002 -- https://bugs.gentoo.org/681002
+ "${FILESDIR}"/${PN}-1.29.0-setup-py.patch
+ "${FILESDIR}"/${P}-tests-unit-cli-test-py.patch
+ # Bug #920631 -- https://bugs.gentoo.org/920631
+ "${FILESDIR}"/${P}-docker-7.patch
+)
+
+DOCS=( CHANGELOG.md README.md )
+
+src_prepare() {
+ # Address QA issue "docker-compose.exe: missing alias (symlink) for completed command."
+ sed 's,^\(complete.*\) docker-compose\.exe\(.*\),\1\2,' -i contrib/completion/bash/docker-compose || die
+
+ default
+}
+
+python_test() {
+ epytest tests/unit/
+}
+
+python_install_all() {
+ newbashcomp contrib/completion/bash/docker-compose ${PN}
+
+ insinto /usr/share/zsh/site-functions
+ doins contrib/completion/zsh/*
+
+ distutils-r1_python_install_all
+}
^ permalink raw reply related [flat|nested] 47+ messages in thread
end of thread, other threads:[~2024-10-03 17:46 UTC | newest]
Thread overview: 47+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-29 15:35 [gentoo-commits] repo/gentoo:master commit in: app-containers/docker-compose/ William Hubbs
-- strict thread matches above, loose matches on Subject: below --
2024-10-03 17:46 Sebastian Pipping
2024-09-28 10:27 Arthur Zamarin
2024-07-02 17:52 William Hubbs
2024-06-14 12:26 Michał Górny
2024-04-12 15:49 William Hubbs
2024-03-22 20:23 Arthur Zamarin
2024-03-22 18:26 Sam James
2024-01-11 18:35 William Hubbs
2024-01-11 18:26 William Hubbs
2023-12-12 23:25 Sebastian Pipping
2023-11-05 19:35 Sebastian Pipping
2023-11-05 19:35 Sebastian Pipping
2023-10-26 19:55 William Hubbs
2023-08-13 4:58 Sam James
2023-08-13 3:21 William Hubbs
2023-08-11 16:06 William Hubbs
2023-08-11 16:06 William Hubbs
2023-08-11 15:20 William Hubbs
2023-07-08 14:05 Sebastian Pipping
2023-04-20 5:01 Sam James
2023-04-19 18:09 Arthur Zamarin
2023-04-16 16:43 Sebastian Pipping
2023-04-13 1:49 Sam James
2023-04-13 1:49 Sam James
2023-04-12 21:06 William Hubbs
2023-04-07 4:56 William Hubbs
2023-04-07 4:13 William Hubbs
2023-03-11 21:43 William Hubbs
2023-03-11 0:34 William Hubbs
2023-03-10 21:35 William Hubbs
2023-03-10 2:34 Sebastian Pipping
2022-11-15 4:10 William Hubbs
2022-11-15 4:10 William Hubbs
2022-09-30 3:41 William Hubbs
2022-06-13 20:27 William Hubbs
2022-06-03 17:13 William Hubbs
2022-05-02 15:23 William Hubbs
2022-04-10 19:01 William Hubbs
2022-03-26 17:07 Arthur Zamarin
2022-03-26 1:37 Sam James
2022-03-17 21:39 William Hubbs
2022-03-17 21:39 William Hubbs
2022-03-16 13:25 Sebastian Pipping
2022-03-15 19:24 William Hubbs
2022-03-15 19:24 William Hubbs
2022-03-15 17:24 William Hubbs
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox