All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH v1 1/1] package/docker-compose: bump to version 2.10.0
@ 2022-09-04 19:10 Christian Stewart via buildroot
  2022-09-04 19:41 ` Yann E. MORIN
                   ` (2 more replies)
  0 siblings, 3 replies; 9+ messages in thread
From: Christian Stewart via buildroot @ 2022-09-04 19:10 UTC (permalink / raw)
  To: buildroot; +Cc: Christian Stewart, Yann E . MORIN, Thomas Petazzoni

Docker Compose v2 is a CLI plugin loaded by docker-cli.

Signed-off-by: Christian Stewart <christian@paral.in>
---
 DEVELOPERS                                    |  1 +
 ...p-generic-versions-and-bump-requests.patch | 66 -------------------
 ...2-Bump-texttable-from-0.9.1-to-1.6.2.patch | 41 ------------
 ...003-support-PyYAML-up-to-5.1-version.patch | 44 -------------
 package/docker-compose/Config.in              | 35 +++-------
 package/docker-compose/docker-compose.hash    |  8 +--
 package/docker-compose/docker-compose.mk      | 17 +++--
 7 files changed, 27 insertions(+), 185 deletions(-)
 delete mode 100644 package/docker-compose/0001-Strip-up-generic-versions-and-bump-requests.patch
 delete mode 100644 package/docker-compose/0002-Bump-texttable-from-0.9.1-to-1.6.2.patch
 delete mode 100644 package/docker-compose/0003-support-PyYAML-up-to-5.1-version.patch

diff --git a/DEVELOPERS b/DEVELOPERS
index d2bd0d809a..38270cb059 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -532,6 +532,7 @@ F:	package/batman-adv/
 F:	package/containerd/
 F:	package/delve/
 F:	package/docker-cli/
+F:	package/docker-compose/
 F:	package/docker-engine/
 F:	package/docker-proxy/
 F:	package/embiggen-disk/
diff --git a/package/docker-compose/0001-Strip-up-generic-versions-and-bump-requests.patch b/package/docker-compose/0001-Strip-up-generic-versions-and-bump-requests.patch
deleted file mode 100644
index 536a9590dd..0000000000
--- a/package/docker-compose/0001-Strip-up-generic-versions-and-bump-requests.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 2bb1a267aba3ca5fe414d0f79192def668c18bab Mon Sep 17 00:00:00 2001
-From: Ulysses Souza <ulysses.souza@docker.com>
-Date: Tue, 2 Jul 2019 15:49:07 +0200
-Subject: [PATCH] Strip up generic versions and bump requests
-
-Replaces generic limitations with a next major value
-Bump the minimal `requests` to 2.20.0
-
-Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
-(cherry picked from commit ce5451c5b4a3b449ce703168d2a568b0a4d25ee6)
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- setup.py | 24 ++++++++++++------------
- 1 file changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 8371cc75..61447801 100644
---- a/setup.py
-+++ b/setup.py
-@@ -31,31 +31,31 @@ def find_version(*file_paths):
- 
- install_requires = [
-     'cached-property >= 1.2.0, < 2',
--    'docopt >= 0.6.1, < 0.7',
--    'PyYAML >= 3.10, < 4.3',
--    'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.21',
--    'texttable >= 0.9.0, < 0.10',
--    'websocket-client >= 0.32.0, < 1.0',
--    'docker[ssh] >= 3.7.0, < 4.0',
--    'dockerpty >= 0.4.1, < 0.5',
-+    'docopt >= 0.6.1, < 1',
-+    'PyYAML >= 3.10, < 5',
-+    'requests >= 2.20.0, < 3',
-+    'texttable >= 0.9.0, < 1',
-+    'websocket-client >= 0.32.0, < 1',
-+    'docker[ssh] >= 3.7.0, < 5',
-+    'dockerpty >= 0.4.1, < 1',
-     'six >= 1.3.0, < 2',
-     'jsonschema >= 2.5.1, < 3',
- ]
- 
- 
- tests_require = [
--    'pytest',
-+    'pytest < 6',
- ]
- 
- 
- if sys.version_info[:2] < (3, 4):
--    tests_require.append('mock >= 1.0.1')
-+    tests_require.append('mock >= 1.0.1, < 2')
- 
- extras_require = {
-     ':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'],
--    ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
--    ':python_version < "3.3"': ['ipaddress >= 1.0.16'],
--    ':sys_platform == "win32"': ['colorama >= 0.4, < 0.5'],
-+    ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'],
-+    ':python_version < "3.3"': ['ipaddress >= 1.0.16, < 2'],
-+    ':sys_platform == "win32"': ['colorama >= 0.4, < 1'],
-     'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'],
- }
- 
--- 
-2.20.1
-
diff --git a/package/docker-compose/0002-Bump-texttable-from-0.9.1-to-1.6.2.patch b/package/docker-compose/0002-Bump-texttable-from-0.9.1-to-1.6.2.patch
deleted file mode 100644
index 92c2e1f133..0000000000
--- a/package/docker-compose/0002-Bump-texttable-from-0.9.1-to-1.6.2.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From e55dd65ba42a17ba4b017b42f14f7ee647efe64f Mon Sep 17 00:00:00 2001
-From: Ulysses Souza <ulysses.souza@docker.com>
-Date: Mon, 8 Jul 2019 14:52:30 +0200
-Subject: [PATCH] Bump texttable from 0.9.1 to 1.6.2
-
-Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
-(cherry picked from commit 0bfa1c34f054d86674434770d4d6340e02508e52)
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- requirements.txt | 2 +-
- setup.py         | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/requirements.txt b/requirements.txt
-index 6007ee3f..d868fdeb 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -19,6 +19,6 @@ PySocks==1.6.7
- PyYAML==4.2b1
- requests==2.20.0
- six==1.10.0
--texttable==0.9.1
-+texttable==1.6.2
- urllib3==1.21.1; python_version == '3.3'
- websocket-client==0.56.0
-diff --git a/setup.py b/setup.py
-index 61447801..c9e4729d 100644
---- a/setup.py
-+++ b/setup.py
-@@ -34,7 +34,7 @@ install_requires = [
-     'docopt >= 0.6.1, < 1',
-     'PyYAML >= 3.10, < 5',
-     'requests >= 2.20.0, < 3',
--    'texttable >= 0.9.0, < 1',
-+    'texttable >= 0.9.0, < 2',
-     'websocket-client >= 0.32.0, < 1',
-     'docker[ssh] >= 3.7.0, < 5',
-     'dockerpty >= 0.4.1, < 1',
--- 
-2.20.1
-
diff --git a/package/docker-compose/0003-support-PyYAML-up-to-5.1-version.patch b/package/docker-compose/0003-support-PyYAML-up-to-5.1-version.patch
deleted file mode 100644
index ecbd197a51..0000000000
--- a/package/docker-compose/0003-support-PyYAML-up-to-5.1-version.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 3be619b814c16c02a02499e7a157dabd065926dd Mon Sep 17 00:00:00 2001
-From: Sergey Fursov <geyser85@gmail.com>
-Date: Sun, 31 Mar 2019 12:45:50 +0700
-Subject: [PATCH] support PyYAML up to 5.1 version
-
-Signed-off-by: Sergey Fursov <geyser85@gmail.com>
-[Upstream: https://github.com/docker/compose/pull/6623]
-(cherry picked from commit d2ca096f46a56cd4db494c593ed84e5c255dc15d)
-[Peter: allow all 5.x]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- requirements.txt | 2 +-
- setup.py         | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/requirements.txt b/requirements.txt
-index d868fdeb..e3dbc807 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -16,7 +16,7 @@ paramiko==2.4.2
- pypiwin32==219; sys_platform == 'win32' and python_version < '3.6'
- pypiwin32==223; sys_platform == 'win32' and python_version >= '3.6'
- PySocks==1.6.7
--PyYAML==4.2b1
-+PyYAML==5.1
- requests==2.20.0
- six==1.10.0
- texttable==1.6.2
-diff --git a/setup.py b/setup.py
-index c9e4729d..17ab678e 100644
---- a/setup.py
-+++ b/setup.py
-@@ -32,7 +32,7 @@ def find_version(*file_paths):
- install_requires = [
-     'cached-property >= 1.2.0, < 2',
-     'docopt >= 0.6.1, < 1',
--    'PyYAML >= 3.10, < 5',
-+    'PyYAML >= 3.10, < 6',
-     'requests >= 2.20.0, < 3',
-     'texttable >= 0.9.0, < 2',
-     'websocket-client >= 0.32.0, < 1',
--- 
-2.20.1
-
diff --git a/package/docker-compose/Config.in b/package/docker-compose/Config.in
index f82a0c4bc2..bac8dff30d 100644
--- a/package/docker-compose/Config.in
+++ b/package/docker-compose/Config.in
@@ -1,30 +1,15 @@
 config BR2_PACKAGE_DOCKER_COMPOSE
 	bool "docker-compose"
-	depends on BR2_USE_MMU # python3
-	depends on BR2_USE_WCHAR # python3
-	depends on BR2_TOOLCHAIN_HAS_THREADS # python3
-	depends on !BR2_STATIC_LIBS # python3
-	# python-paramiko -> python-cryptography
-	depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS
-	select BR2_PACKAGE_PYTHON3
-	select BR2_PACKAGE_PYTHON_CACHED_PROPERTY # runtime
-	select BR2_PACKAGE_PYTHON_DOCOPT # runtime
-	select BR2_PACKAGE_PYTHON_PARAMIKO # runtime
-	select BR2_PACKAGE_PYTHON_PYYAML # runtime
-	select BR2_PACKAGE_PYTHON_REQUESTS # runtime
-	select BR2_PACKAGE_PYTHON_TEXTTABLE # runtime
-	select BR2_PACKAGE_PYTHON_WEBSOCKET_CLIENT # runtime
-	select BR2_PACKAGE_PYTHON_DOCKER # runtime
-	select BR2_PACKAGE_PYTHON_DOCKERPTY # runtime
-	select BR2_PACKAGE_PYTHON_SIX # runtime
-	select BR2_PACKAGE_PYTHON_JSONSCHEMA # runtime
+	depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
+	depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_DOCKER_CLI
 	help
-	  Multi-container orchestration for Docker.
+	  Multi-container applications with the Docker CLI.
 
-	  https://www.docker.com/
+	  https://github.com/docker/compose
 
-comment "docker-compose needs a toolchain w/ wchar, threads, dynamic library"
-	depends on BR2_USE_MMU
-	depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS
-	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
-		BR2_STATIC_LIBS
+comment "docker-compose needs a toolchain w/ threads"
+	depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
+	depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/docker-compose/docker-compose.hash b/package/docker-compose/docker-compose.hash
index 42d71c8095..46a8c59d55 100644
--- a/package/docker-compose/docker-compose.hash
+++ b/package/docker-compose/docker-compose.hash
@@ -1,5 +1,3 @@
-# from https://pypi.python.org/pypi/docker-compose/json
-sha256  a5d58e974fd717e24b0dda6669a46bc03548d9023ef38d965acdc32d4d5fa753  docker-compose-1.24.1.tar.gz
-
-# locally computed
-sha256  552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243  LICENSE
+# Locally computed
+sha256  7f051283dc2c047a40604c52dffa579a079bdf54eca742da54f8352dcffc3549  docker-compose-2.10.0.tar.gz
+sha256  58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd  LICENSE
diff --git a/package/docker-compose/docker-compose.mk b/package/docker-compose/docker-compose.mk
index ec24157c56..1d071cc423 100644
--- a/package/docker-compose/docker-compose.mk
+++ b/package/docker-compose/docker-compose.mk
@@ -4,10 +4,19 @@
 #
 ################################################################################
 
-DOCKER_COMPOSE_VERSION = 1.24.1
-DOCKER_COMPOSE_SITE = https://files.pythonhosted.org/packages/b6/a4/59c39df6a23144a6252ad33170dfbf781af5953651e4587e8ea5f995f95e
-DOCKER_COMPOSE_SETUP_TYPE = setuptools
+DOCKER_COMPOSE_VERSION = 2.10.0
+DOCKER_COMPOSE_SITE = $(call github,docker,compose,v$(DOCKER_COMPOSE_VERSION))
 DOCKER_COMPOSE_LICENSE = Apache-2.0
 DOCKER_COMPOSE_LICENSE_FILES = LICENSE
 
-$(eval $(python-package))
+DOCKER_COMPOSE_BUILD_TARGETS = cmd
+DOCKER_COMPOSE_GOMOD = github.com/docker/compose/v2
+DOCKER_COMPOSE_LDFLAGS = \
+	-X github.com/docker/compose/v2/internal.Version=$(DOCKER_COMPOSE_VERSION)
+
+define DOCKER_COMPOSE_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 755 $(@D)/bin/cmd \
+		$(TARGET_DIR)/usr/lib/docker/cli-plugins/docker-compose
+endef
+
+$(eval $(golang-package))
-- 
2.37.3

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* Re: [Buildroot] [PATCH v1 1/1] package/docker-compose: bump to version 2.10.0
  2022-09-04 19:10 [Buildroot] [PATCH v1 1/1] package/docker-compose: bump to version 2.10.0 Christian Stewart via buildroot
@ 2022-09-04 19:41 ` Yann E. MORIN
  2022-09-04 20:02   ` Christian Stewart via buildroot
  2022-09-06  8:22 ` Yann E. MORIN
  2022-10-31 22:02 ` Thomas Petazzoni via buildroot
  2 siblings, 1 reply; 9+ messages in thread
From: Yann E. MORIN @ 2022-09-04 19:41 UTC (permalink / raw)
  To: Christian Stewart; +Cc: Thomas Petazzoni, buildroot

Christian, All,

On 2022-09-04 12:10 -0700, Christian Stewart via buildroot spake thusly:
> Docker Compose v2 is a CLI plugin loaded by docker-cli.

So, if it is a plugin for docker-cli...

[--SNIP--]
> diff --git a/package/docker-compose/Config.in b/package/docker-compose/Config.in
> index f82a0c4bc2..bac8dff30d 100644
> --- a/package/docker-compose/Config.in
> +++ b/package/docker-compose/Config.in
> @@ -1,30 +1,15 @@
>  config BR2_PACKAGE_DOCKER_COMPOSE
>  	bool "docker-compose"
[--SNIP--]
> +	depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
> +	depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
> +	depends on BR2_TOOLCHAIN_HAS_THREADS
> +	select BR2_PACKAGE_DOCKER_CLI

... then it should depend on it instead, no?

Indeed, the "main" program is docker-cli. Installing plugins for it does
not make sense unless it is first enabled.

That's what we do, for example, for nginx and its plugins.

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [Buildroot] [PATCH v1 1/1] package/docker-compose: bump to version 2.10.0
  2022-09-04 19:41 ` Yann E. MORIN
@ 2022-09-04 20:02   ` Christian Stewart via buildroot
  2022-09-05 14:08     ` Yann E. MORIN
  0 siblings, 1 reply; 9+ messages in thread
From: Christian Stewart via buildroot @ 2022-09-04 20:02 UTC (permalink / raw)
  To: Yann E. MORIN; +Cc: Christian Stewart, Thomas Petazzoni, Buildroot Mailing List

Hi Yann,

On Sun, Sep 4, 2022 at 12:41 PM Yann E. MORIN <yann.morin.1998@free.fr> wrote:
>
> Christian, All,
>
> On 2022-09-04 12:10 -0700, Christian Stewart via buildroot spake thusly:
> > Docker Compose v2 is a CLI plugin loaded by docker-cli.
>
> So, if it is a plugin for docker-cli...

I thought about doing that, with docker-compose in a sub-menu under DOCKER_CLI.

But given that historically it was a separate package, and people may
not necessarily realize it's a plugin,

I instead decided to just `select BR2_PACKAGE_DOCKER_CLI` if
DOCKER_COMPOSE is enabled.

Do you want me to re-submit it with the plugin style instead?

Thanks,
Christian
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [Buildroot] [PATCH v1 1/1] package/docker-compose: bump to version 2.10.0
  2022-09-04 20:02   ` Christian Stewart via buildroot
@ 2022-09-05 14:08     ` Yann E. MORIN
  0 siblings, 0 replies; 9+ messages in thread
From: Yann E. MORIN @ 2022-09-05 14:08 UTC (permalink / raw)
  To: Christian Stewart; +Cc: Thomas Petazzoni, Buildroot Mailing List

Christian, All,

On 2022-09-04 13:02 -0700, Christian Stewart spake thusly:
> On Sun, Sep 4, 2022 at 12:41 PM Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> > On 2022-09-04 12:10 -0700, Christian Stewart via buildroot spake thusly:
> > > Docker Compose v2 is a CLI plugin loaded by docker-cli.
> > So, if it is a plugin for docker-cli...
> I thought about doing that, with docker-compose in a sub-menu under DOCKER_CLI.

Not in a sub-menu, but as a separate package that depends on docker-cli.

> But given that historically it was a separate package, and people may
> not necessarily realize it's a plugin,

It happens al the time that, when we bump a package version, it gains ne
dependencies. We do nt have a good mechanism for that, except people can
run utils/diffconfig to check their .config files before and after they
update to  newer Buildroot version.

> I instead decided to just `select BR2_PACKAGE_DOCKER_CLI` if
> DOCKER_COMPOSE is enabled.

I see the reasoning, but I still think the select should be switched to
a depends on.

> Do you want me to re-submit it with the plugin style instead?

No need, it is trivial to do when applying.

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [Buildroot] [PATCH v1 1/1] package/docker-compose: bump to version 2.10.0
  2022-09-04 19:10 [Buildroot] [PATCH v1 1/1] package/docker-compose: bump to version 2.10.0 Christian Stewart via buildroot
  2022-09-04 19:41 ` Yann E. MORIN
@ 2022-09-06  8:22 ` Yann E. MORIN
  2022-10-31 22:02 ` Thomas Petazzoni via buildroot
  2 siblings, 0 replies; 9+ messages in thread
From: Yann E. MORIN @ 2022-09-06  8:22 UTC (permalink / raw)
  To: Christian Stewart; +Cc: Thomas Petazzoni, buildroot

Christian, All,

On 2022-09-04 12:10 -0700, Christian Stewart spake thusly:
> Docker Compose v2 is a CLI plugin loaded by docker-cli.
> 
> Signed-off-by: Christian Stewart <christian@paral.in>

Applied to next, with the following changes, thanks:

  - don't select docker-cli, but depends-on it; explain it in commit log
  - explain why we override the install commands
  - explain change in license file hash

Please, try to be a bit more verbose in your commit logs...

Regards,
Yann E. MORIN.

> ---
>  DEVELOPERS                                    |  1 +
>  ...p-generic-versions-and-bump-requests.patch | 66 -------------------
>  ...2-Bump-texttable-from-0.9.1-to-1.6.2.patch | 41 ------------
>  ...003-support-PyYAML-up-to-5.1-version.patch | 44 -------------
>  package/docker-compose/Config.in              | 35 +++-------
>  package/docker-compose/docker-compose.hash    |  8 +--
>  package/docker-compose/docker-compose.mk      | 17 +++--
>  7 files changed, 27 insertions(+), 185 deletions(-)
>  delete mode 100644 package/docker-compose/0001-Strip-up-generic-versions-and-bump-requests.patch
>  delete mode 100644 package/docker-compose/0002-Bump-texttable-from-0.9.1-to-1.6.2.patch
>  delete mode 100644 package/docker-compose/0003-support-PyYAML-up-to-5.1-version.patch
> 
> diff --git a/DEVELOPERS b/DEVELOPERS
> index d2bd0d809a..38270cb059 100644
> --- a/DEVELOPERS
> +++ b/DEVELOPERS
> @@ -532,6 +532,7 @@ F:	package/batman-adv/
>  F:	package/containerd/
>  F:	package/delve/
>  F:	package/docker-cli/
> +F:	package/docker-compose/
>  F:	package/docker-engine/
>  F:	package/docker-proxy/
>  F:	package/embiggen-disk/
> diff --git a/package/docker-compose/0001-Strip-up-generic-versions-and-bump-requests.patch b/package/docker-compose/0001-Strip-up-generic-versions-and-bump-requests.patch
> deleted file mode 100644
> index 536a9590dd..0000000000
> --- a/package/docker-compose/0001-Strip-up-generic-versions-and-bump-requests.patch
> +++ /dev/null
> @@ -1,66 +0,0 @@
> -From 2bb1a267aba3ca5fe414d0f79192def668c18bab Mon Sep 17 00:00:00 2001
> -From: Ulysses Souza <ulysses.souza@docker.com>
> -Date: Tue, 2 Jul 2019 15:49:07 +0200
> -Subject: [PATCH] Strip up generic versions and bump requests
> -
> -Replaces generic limitations with a next major value
> -Bump the minimal `requests` to 2.20.0
> -
> -Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
> -(cherry picked from commit ce5451c5b4a3b449ce703168d2a568b0a4d25ee6)
> -Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
> ----
> - setup.py | 24 ++++++++++++------------
> - 1 file changed, 12 insertions(+), 12 deletions(-)
> -
> -diff --git a/setup.py b/setup.py
> -index 8371cc75..61447801 100644
> ---- a/setup.py
> -+++ b/setup.py
> -@@ -31,31 +31,31 @@ def find_version(*file_paths):
> - 
> - install_requires = [
> -     'cached-property >= 1.2.0, < 2',
> --    'docopt >= 0.6.1, < 0.7',
> --    'PyYAML >= 3.10, < 4.3',
> --    'requests >= 2.6.1, != 2.11.0, != 2.12.2, != 2.18.0, < 2.21',
> --    'texttable >= 0.9.0, < 0.10',
> --    'websocket-client >= 0.32.0, < 1.0',
> --    'docker[ssh] >= 3.7.0, < 4.0',
> --    'dockerpty >= 0.4.1, < 0.5',
> -+    'docopt >= 0.6.1, < 1',
> -+    'PyYAML >= 3.10, < 5',
> -+    'requests >= 2.20.0, < 3',
> -+    'texttable >= 0.9.0, < 1',
> -+    'websocket-client >= 0.32.0, < 1',
> -+    'docker[ssh] >= 3.7.0, < 5',
> -+    'dockerpty >= 0.4.1, < 1',
> -     'six >= 1.3.0, < 2',
> -     'jsonschema >= 2.5.1, < 3',
> - ]
> - 
> - 
> - tests_require = [
> --    'pytest',
> -+    'pytest < 6',
> - ]
> - 
> - 
> - if sys.version_info[:2] < (3, 4):
> --    tests_require.append('mock >= 1.0.1')
> -+    tests_require.append('mock >= 1.0.1, < 2')
> - 
> - extras_require = {
> -     ':python_version < "3.4"': ['enum34 >= 1.0.4, < 2'],
> --    ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5'],
> --    ':python_version < "3.3"': ['ipaddress >= 1.0.16'],
> --    ':sys_platform == "win32"': ['colorama >= 0.4, < 0.5'],
> -+    ':python_version < "3.5"': ['backports.ssl_match_hostname >= 3.5, < 4'],
> -+    ':python_version < "3.3"': ['ipaddress >= 1.0.16, < 2'],
> -+    ':sys_platform == "win32"': ['colorama >= 0.4, < 1'],
> -     'socks': ['PySocks >= 1.5.6, != 1.5.7, < 2'],
> - }
> - 
> --- 
> -2.20.1
> -
> diff --git a/package/docker-compose/0002-Bump-texttable-from-0.9.1-to-1.6.2.patch b/package/docker-compose/0002-Bump-texttable-from-0.9.1-to-1.6.2.patch
> deleted file mode 100644
> index 92c2e1f133..0000000000
> --- a/package/docker-compose/0002-Bump-texttable-from-0.9.1-to-1.6.2.patch
> +++ /dev/null
> @@ -1,41 +0,0 @@
> -From e55dd65ba42a17ba4b017b42f14f7ee647efe64f Mon Sep 17 00:00:00 2001
> -From: Ulysses Souza <ulysses.souza@docker.com>
> -Date: Mon, 8 Jul 2019 14:52:30 +0200
> -Subject: [PATCH] Bump texttable from 0.9.1 to 1.6.2
> -
> -Signed-off-by: Ulysses Souza <ulysses.souza@docker.com>
> -(cherry picked from commit 0bfa1c34f054d86674434770d4d6340e02508e52)
> -Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
> ----
> - requirements.txt | 2 +-
> - setup.py         | 2 +-
> - 2 files changed, 2 insertions(+), 2 deletions(-)
> -
> -diff --git a/requirements.txt b/requirements.txt
> -index 6007ee3f..d868fdeb 100644
> ---- a/requirements.txt
> -+++ b/requirements.txt
> -@@ -19,6 +19,6 @@ PySocks==1.6.7
> - PyYAML==4.2b1
> - requests==2.20.0
> - six==1.10.0
> --texttable==0.9.1
> -+texttable==1.6.2
> - urllib3==1.21.1; python_version == '3.3'
> - websocket-client==0.56.0
> -diff --git a/setup.py b/setup.py
> -index 61447801..c9e4729d 100644
> ---- a/setup.py
> -+++ b/setup.py
> -@@ -34,7 +34,7 @@ install_requires = [
> -     'docopt >= 0.6.1, < 1',
> -     'PyYAML >= 3.10, < 5',
> -     'requests >= 2.20.0, < 3',
> --    'texttable >= 0.9.0, < 1',
> -+    'texttable >= 0.9.0, < 2',
> -     'websocket-client >= 0.32.0, < 1',
> -     'docker[ssh] >= 3.7.0, < 5',
> -     'dockerpty >= 0.4.1, < 1',
> --- 
> -2.20.1
> -
> diff --git a/package/docker-compose/0003-support-PyYAML-up-to-5.1-version.patch b/package/docker-compose/0003-support-PyYAML-up-to-5.1-version.patch
> deleted file mode 100644
> index ecbd197a51..0000000000
> --- a/package/docker-compose/0003-support-PyYAML-up-to-5.1-version.patch
> +++ /dev/null
> @@ -1,44 +0,0 @@
> -From 3be619b814c16c02a02499e7a157dabd065926dd Mon Sep 17 00:00:00 2001
> -From: Sergey Fursov <geyser85@gmail.com>
> -Date: Sun, 31 Mar 2019 12:45:50 +0700
> -Subject: [PATCH] support PyYAML up to 5.1 version
> -
> -Signed-off-by: Sergey Fursov <geyser85@gmail.com>
> -[Upstream: https://github.com/docker/compose/pull/6623]
> -(cherry picked from commit d2ca096f46a56cd4db494c593ed84e5c255dc15d)
> -[Peter: allow all 5.x]
> -Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
> ----
> - requirements.txt | 2 +-
> - setup.py         | 2 +-
> - 2 files changed, 2 insertions(+), 2 deletions(-)
> -
> -diff --git a/requirements.txt b/requirements.txt
> -index d868fdeb..e3dbc807 100644
> ---- a/requirements.txt
> -+++ b/requirements.txt
> -@@ -16,7 +16,7 @@ paramiko==2.4.2
> - pypiwin32==219; sys_platform == 'win32' and python_version < '3.6'
> - pypiwin32==223; sys_platform == 'win32' and python_version >= '3.6'
> - PySocks==1.6.7
> --PyYAML==4.2b1
> -+PyYAML==5.1
> - requests==2.20.0
> - six==1.10.0
> - texttable==1.6.2
> -diff --git a/setup.py b/setup.py
> -index c9e4729d..17ab678e 100644
> ---- a/setup.py
> -+++ b/setup.py
> -@@ -32,7 +32,7 @@ def find_version(*file_paths):
> - install_requires = [
> -     'cached-property >= 1.2.0, < 2',
> -     'docopt >= 0.6.1, < 1',
> --    'PyYAML >= 3.10, < 5',
> -+    'PyYAML >= 3.10, < 6',
> -     'requests >= 2.20.0, < 3',
> -     'texttable >= 0.9.0, < 2',
> -     'websocket-client >= 0.32.0, < 1',
> --- 
> -2.20.1
> -
> diff --git a/package/docker-compose/Config.in b/package/docker-compose/Config.in
> index f82a0c4bc2..bac8dff30d 100644
> --- a/package/docker-compose/Config.in
> +++ b/package/docker-compose/Config.in
> @@ -1,30 +1,15 @@
>  config BR2_PACKAGE_DOCKER_COMPOSE
>  	bool "docker-compose"
> -	depends on BR2_USE_MMU # python3
> -	depends on BR2_USE_WCHAR # python3
> -	depends on BR2_TOOLCHAIN_HAS_THREADS # python3
> -	depends on !BR2_STATIC_LIBS # python3
> -	# python-paramiko -> python-cryptography
> -	depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS
> -	select BR2_PACKAGE_PYTHON3
> -	select BR2_PACKAGE_PYTHON_CACHED_PROPERTY # runtime
> -	select BR2_PACKAGE_PYTHON_DOCOPT # runtime
> -	select BR2_PACKAGE_PYTHON_PARAMIKO # runtime
> -	select BR2_PACKAGE_PYTHON_PYYAML # runtime
> -	select BR2_PACKAGE_PYTHON_REQUESTS # runtime
> -	select BR2_PACKAGE_PYTHON_TEXTTABLE # runtime
> -	select BR2_PACKAGE_PYTHON_WEBSOCKET_CLIENT # runtime
> -	select BR2_PACKAGE_PYTHON_DOCKER # runtime
> -	select BR2_PACKAGE_PYTHON_DOCKERPTY # runtime
> -	select BR2_PACKAGE_PYTHON_SIX # runtime
> -	select BR2_PACKAGE_PYTHON_JSONSCHEMA # runtime
> +	depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
> +	depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
> +	depends on BR2_TOOLCHAIN_HAS_THREADS
> +	select BR2_PACKAGE_DOCKER_CLI
>  	help
> -	  Multi-container orchestration for Docker.
> +	  Multi-container applications with the Docker CLI.
>  
> -	  https://www.docker.com/
> +	  https://github.com/docker/compose
>  
> -comment "docker-compose needs a toolchain w/ wchar, threads, dynamic library"
> -	depends on BR2_USE_MMU
> -	depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS
> -	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
> -		BR2_STATIC_LIBS
> +comment "docker-compose needs a toolchain w/ threads"
> +	depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
> +	depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
> +	depends on !BR2_TOOLCHAIN_HAS_THREADS
> diff --git a/package/docker-compose/docker-compose.hash b/package/docker-compose/docker-compose.hash
> index 42d71c8095..46a8c59d55 100644
> --- a/package/docker-compose/docker-compose.hash
> +++ b/package/docker-compose/docker-compose.hash
> @@ -1,5 +1,3 @@
> -# from https://pypi.python.org/pypi/docker-compose/json
> -sha256  a5d58e974fd717e24b0dda6669a46bc03548d9023ef38d965acdc32d4d5fa753  docker-compose-1.24.1.tar.gz
> -
> -# locally computed
> -sha256  552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243  LICENSE
> +# Locally computed
> +sha256  7f051283dc2c047a40604c52dffa579a079bdf54eca742da54f8352dcffc3549  docker-compose-2.10.0.tar.gz
> +sha256  58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd  LICENSE
> diff --git a/package/docker-compose/docker-compose.mk b/package/docker-compose/docker-compose.mk
> index ec24157c56..1d071cc423 100644
> --- a/package/docker-compose/docker-compose.mk
> +++ b/package/docker-compose/docker-compose.mk
> @@ -4,10 +4,19 @@
>  #
>  ################################################################################
>  
> -DOCKER_COMPOSE_VERSION = 1.24.1
> -DOCKER_COMPOSE_SITE = https://files.pythonhosted.org/packages/b6/a4/59c39df6a23144a6252ad33170dfbf781af5953651e4587e8ea5f995f95e
> -DOCKER_COMPOSE_SETUP_TYPE = setuptools
> +DOCKER_COMPOSE_VERSION = 2.10.0
> +DOCKER_COMPOSE_SITE = $(call github,docker,compose,v$(DOCKER_COMPOSE_VERSION))
>  DOCKER_COMPOSE_LICENSE = Apache-2.0
>  DOCKER_COMPOSE_LICENSE_FILES = LICENSE
>  
> -$(eval $(python-package))
> +DOCKER_COMPOSE_BUILD_TARGETS = cmd
> +DOCKER_COMPOSE_GOMOD = github.com/docker/compose/v2
> +DOCKER_COMPOSE_LDFLAGS = \
> +	-X github.com/docker/compose/v2/internal.Version=$(DOCKER_COMPOSE_VERSION)
> +
> +define DOCKER_COMPOSE_INSTALL_TARGET_CMDS
> +	$(INSTALL) -D -m 755 $(@D)/bin/cmd \
> +		$(TARGET_DIR)/usr/lib/docker/cli-plugins/docker-compose
> +endef
> +
> +$(eval $(golang-package))
> -- 
> 2.37.3
> 

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [Buildroot] [PATCH v1 1/1] package/docker-compose: bump to version 2.10.0
  2022-09-04 19:10 [Buildroot] [PATCH v1 1/1] package/docker-compose: bump to version 2.10.0 Christian Stewart via buildroot
  2022-09-04 19:41 ` Yann E. MORIN
  2022-09-06  8:22 ` Yann E. MORIN
@ 2022-10-31 22:02 ` Thomas Petazzoni via buildroot
  2022-10-31 22:08   ` Christian Stewart via buildroot
  2 siblings, 1 reply; 9+ messages in thread
From: Thomas Petazzoni via buildroot @ 2022-10-31 22:02 UTC (permalink / raw)
  To: Christian Stewart; +Cc: Yann E . MORIN, buildroot@buildroot.org

Hello Christian,

On Sun,  4 Sep 2022 12:10:10 -0700
Christian Stewart via buildroot <buildroot@buildroot.org> wrote:

> -$(eval $(python-package))
> +DOCKER_COMPOSE_BUILD_TARGETS = cmd
> +DOCKER_COMPOSE_GOMOD = github.com/docker/compose/v2
> +DOCKER_COMPOSE_LDFLAGS = \
> +	-X github.com/docker/compose/v2/internal.Version=$(DOCKER_COMPOSE_VERSION)
> +
> +define DOCKER_COMPOSE_INSTALL_TARGET_CMDS
> +	$(INSTALL) -D -m 755 $(@D)/bin/cmd \
> +		$(TARGET_DIR)/usr/lib/docker/cli-plugins/docker-compose
> +endef
> +
> +$(eval $(golang-package))

It looks like this commit has broken our docker compose test case
(support/testing/tests/package/test_docker_compose.py). Indeed, this
test expects to be able to run a command called "docker-compose", which
no longer exists, so the test fails with:

# docker-compose up -d
-sh: docker-compose: not found
# echo $?
127

See:

  https://gitlab.com/buildroot.org/buildroot/-/jobs/3249828442
  https://buildroot.org.gitlab.io/-/buildroot/-/jobs/3249828442/artifacts/test-output/TestDockerCompose-build.log
  https://buildroot.org.gitlab.io/-/buildroot/-/jobs/3249828442/artifacts/test-output/TestDockerCompose-run.log

Could have a look and provide a patch to fix this test case?

Also, could you send a patch adding yourself in the DEVELOPERS file for
this test case, since you're often looking after Docker related topics
in Buildroot?

Thanks a lot!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [Buildroot] [PATCH v1 1/1] package/docker-compose: bump to version 2.10.0
  2022-10-31 22:02 ` Thomas Petazzoni via buildroot
@ 2022-10-31 22:08   ` Christian Stewart via buildroot
  2022-10-31 22:31     ` Thomas Petazzoni via buildroot
  0 siblings, 1 reply; 9+ messages in thread
From: Christian Stewart via buildroot @ 2022-10-31 22:08 UTC (permalink / raw)
  To: Thomas Petazzoni
  Cc: Christian Stewart, Yann E . MORIN, buildroot@buildroot.org

Hi Thomas,

On Mon, Oct 31, 2022 at 3:02 PM Thomas Petazzoni
<thomas.petazzoni@bootlin.com> wrote:
> It looks like this commit has broken our docker compose test case
> (support/testing/tests/package/test_docker_compose.py). Indeed, this
> test expects to be able to run a command called "docker-compose", which
> no longer exists, so the test fails with:
>
> # docker-compose up -d
> -sh: docker-compose: not found
> # echo $?
> 127

The change is to run "docker compose" instead of "docker-compose"

diff --git a/support/testing/tests/package/test_docker_compose.py
b/support/testing/tests/package/test_docker_compose.py
index 1ce132c242..10ceee3167 100644
--- a/support/testing/tests/package/test_docker_compose.py
+++ b/support/testing/tests/package/test_docker_compose.py
@@ -40,7 +40,7 @@ class TestDockerCompose(infra.basetest.BRTest):

     def docker_compose_test(self):
         # will download container if not available, which may take some time
-        self.assertRunOk('docker-compose up -d', 120)
+        self.assertRunOk('docker compose up -d', 120)
         # container may take some time to start
         self.assertRunOk('while ! docker inspect root_busybox_1 2>&1
>/dev/null; do sleep 1; done', 120)
         self.assertRunOk('wget -O /tmp/busybox http://127.0.0.1/busybox', 120


> Also, could you send a patch adding yourself in the DEVELOPERS file for
> this test case, since you're often looking after Docker related topics
> in Buildroot?

I can send a patch for that too, are you able to check real quick if
that change above fixes the issue?

Thanks,
Christian Stewart
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* Re: [Buildroot] [PATCH v1 1/1] package/docker-compose: bump to version 2.10.0
  2022-10-31 22:08   ` Christian Stewart via buildroot
@ 2022-10-31 22:31     ` Thomas Petazzoni via buildroot
  2022-11-01  0:32       ` Christian Stewart via buildroot
  0 siblings, 1 reply; 9+ messages in thread
From: Thomas Petazzoni via buildroot @ 2022-10-31 22:31 UTC (permalink / raw)
  To: Christian Stewart; +Cc: Yann E . MORIN, buildroot@buildroot.org

On Mon, 31 Oct 2022 15:08:04 -0700
Christian Stewart <christian@paral.in> wrote:

> I can send a patch for that too, are you able to check real quick if
> that change above fixes the issue?

It does fix the docker compose issue, but then the loop of docker
inspect that waits for the container to be ready never completes:

# while ! docker inspect root_busybox_1 2>&1 >/dev/null; do sleep 1; done
Error: No such object: root_busybox_1
Error: No such object: root_busybox_1
Error: No such object: root_busybox_1
Error: No such object: root_busybox_1
Error: No such object: root_busybox_1
Error: No such object: root_busybox_1
Error: No such object: root_busybox_1
Error: No such object: root_busybox_1
Error: No such object: root_busybox_1
Error: No such object: root_busybox_1
Error: No such object: root_busybox_1
Error: No such object: root_busybox_1
Error: No such object: root_busybox_1
[.... until it gets killed by the timeout ....]

Best regards,

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [Buildroot] [PATCH v1 1/1] package/docker-compose: bump to version 2.10.0
  2022-10-31 22:31     ` Thomas Petazzoni via buildroot
@ 2022-11-01  0:32       ` Christian Stewart via buildroot
  0 siblings, 0 replies; 9+ messages in thread
From: Christian Stewart via buildroot @ 2022-11-01  0:32 UTC (permalink / raw)
  To: Thomas Petazzoni
  Cc: Christian Stewart, Yann E . MORIN, buildroot@buildroot.org

Hi Thomas,


On Mon, Oct 31, 2022 at 3:31 PM Thomas Petazzoni
<thomas.petazzoni@bootlin.com> wrote:
> It does fix the docker compose issue, but then the loop of docker
> inspect that waits for the container to be ready never completes:
>
> # while ! docker inspect root_busybox_1 2>&1 >/dev/null; do sleep 1; done
> Error: No such object: root_busybox_1

I've submitted the patch series(s) to fix this, however, for the record:

This was because docker compose v2 uses root-busybox-1 as the
container name (no underscores).

Best,
Christian Stewart
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-11-01  0:32 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-04 19:10 [Buildroot] [PATCH v1 1/1] package/docker-compose: bump to version 2.10.0 Christian Stewart via buildroot
2022-09-04 19:41 ` Yann E. MORIN
2022-09-04 20:02   ` Christian Stewart via buildroot
2022-09-05 14:08     ` Yann E. MORIN
2022-09-06  8:22 ` Yann E. MORIN
2022-10-31 22:02 ` Thomas Petazzoni via buildroot
2022-10-31 22:08   ` Christian Stewart via buildroot
2022-10-31 22:31     ` Thomas Petazzoni via buildroot
2022-11-01  0:32       ` Christian Stewart via buildroot

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.