package/docker-compose: bump to version 2.10.0
Docker Compose v2 is no longer a standalone component, but is now a plugin loaded by docker-cli. As such, it should not be installed in /usr/bin, but in the directory where docker-cli loads its plugins from. Additionally, we consequently make docker-compose depend on docker-cli; indeed, it does not really make sense to present a plugin unless the component it attaches to is already enabled [0]. License hash changed due to strictly copying the license text template, without customisation to the year and copyright owner. [0] the original submission by Christian would use a select, to keep existing config, but that's not sensible, as we already have some packages that are plugins and that use depends-on, like nginx plugins. For consistency and as it semantically makes sense, we use a depends-on here too. Signed-off-by: Christian Stewart <christian@paral.in> [yann.morin.1998@free.fr: - 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 ] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Christian Stewart
Yann E. MORIN
parent
1ea9c7d781
commit
c336281243
@ -534,6 +534,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/
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
depends on 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 docker-cli and 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 || !BR2_PACKAGE_DOCKER_CLI
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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))
|
||||
|
||||
Loading…
Reference in New Issue
Block a user