aboutsummaryrefslogtreecommitdiff
path: root/support
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2019-10-26 16:05:24 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2019-10-26 20:17:14 +0200
commit1cab59a5e808c448063be4984cb52c6abe775236 (patch)
tree97ba464f2cd3dc2609c00246932b91e11c7f23c9 /support
parent845db35fe4c9ceacfee6331ce80ff8b8c0b183f7 (diff)
downloadbuildroot-1cab59a5e808c448063be4984cb52c6abe775236.tar.gz
buildroot-1cab59a5e808c448063be4984cb52c6abe775236.tar.bz2
package/docker-compose: bump version to 1.24.1
Fixes https://gitlab.com/buildroot.org/buildroot/-/jobs/332656041 The recent bump of a number of python packages broke docker-compose, as docker-compose specifies both minimum and maximum versions for (most of) its dependencies: Dependencies of docker-compse 1.20.1 (! = unmet): cached-property: < 2 (currently 1.51) docopt: < 0.7 (currently 0.6.2) ! pyyaml: < 4.0, patched to < 4.3 (currently 5.1.2) requests: < 2.19, patched to < 3 (currently 2.22.0) ! texttable: < 0.10 (currently 1.6.2) websocket-client: < 1.0 (currently 0.56.0) ! docker: < 4.0 (currently 4.1.0) dockerpty: < 0.5 (currently 0.4.1) six: < 2 (currently 1.12.0) jsonschema: < 3 (currently 2.5.1) enum34: < 2 (currently 1.1.6) backports.ssl-match-hostname: >= 3.5 (currently 3.7.0.1) ipaddress: >= 1.0.16 (currently 1.0.23) To fix this, bump docker-compose to the most recent release (1.24.1). This is unfortunately not enough, as our docker, pyyaml, requests and texttable packages are too new, so add 3 patches from upstream to relax the version checks of dependencies. Notice that patch 0003 is from https://github.com/docker/compose/pull/6623 and has not been merged yet. Discussions around the problem of these maximum versions of the dependencies and the fact that all downstream users have to patch it is ongoing here: https://github.com/docker/compose/issues/6756 docker-compose 1.24.1 added a requirement for ssh support in python-docker in: https://github.com/docker/compose/commit/7b82b2e8c721010b73f664e9d4657746a1fcd92b So add a dependency for python-paramiko and update the toolchain dependency for C++ (from python-paramiko -> python-cryptography) and adjust the toolchain configuration of the runtime test to match. Signed-off-by: Peter Korsgaard <peter@korsgaard.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Diffstat (limited to 'support')
-rw-r--r--support/testing/tests/package/test_docker_compose.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/support/testing/tests/package/test_docker_compose.py b/support/testing/tests/package/test_docker_compose.py
index de53a3da14..f12e2a6a3d 100644
--- a/support/testing/tests/package/test_docker_compose.py
+++ b/support/testing/tests/package/test_docker_compose.py
@@ -10,6 +10,7 @@ class TestDockerCompose(infra.basetest.BRTest):
BR2_x86_core2=y
BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
BR2_KERNEL_HEADERS_4_19=y
+ BR2_TOOLCHAIN_BUILDROOT_CXX=y
BR2_SYSTEM_DHCP="eth0"
BR2_ROOTFS_POST_BUILD_SCRIPT="{}"
BR2_ROOTFS_POST_SCRIPT_ARGS="{}"