From 50b63ca9df856de5d5f06399af543e6dacf10b20 Mon Sep 17 00:00:00 2001 From: Lance Linder Date: Tue, 1 Aug 2023 07:47:38 +0700 Subject: [PATCH 1/2] Fix PEP668 error installing cqlsh --- docker/test-images/zipkin-cassandra/install.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/test-images/zipkin-cassandra/install.sh b/docker/test-images/zipkin-cassandra/install.sh index 96bc436c46e..59b72569fd9 100755 --- a/docker/test-images/zipkin-cassandra/install.sh +++ b/docker/test-images/zipkin-cassandra/install.sh @@ -201,6 +201,9 @@ apk add --update --no-cache python3 py3-pip # the following are necessary for compiling cffi. If pip someday changes and # doesn't compile cffi on arrch64 then we can remove these dependencies. apk add --update --no-cache gcc python3-dev musl-dev libffi-dev +# PEP 668 protects against mixing system and pip packages. Setup virtual env to avoid this. +python3 -m venv .venv +source .venv/bin/activate pip install -Iq cqlsh function cql() { cqlsh --cqlversion=${cqlversion} "$@" 127.0.0.1 ${temp_native_transport_port} From 62f5a76540ddea72d6644fcf770a31a150cf8d67 Mon Sep 17 00:00:00 2001 From: Lance Linder Date: Tue, 1 Aug 2023 08:02:06 +0700 Subject: [PATCH 2/2] Fix mysql version --- docker/test-images/zipkin-mysql/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/test-images/zipkin-mysql/Dockerfile b/docker/test-images/zipkin-mysql/Dockerfile index 0961a05cc82..edd73e07641 100644 --- a/docker/test-images/zipkin-mysql/Dockerfile +++ b/docker/test-images/zipkin-mysql/Dockerfile @@ -37,7 +37,7 @@ HEALTHCHECK --interval=1s --start-period=30s --timeout=5s CMD ["docker-healthche ENTRYPOINT ["start-mysql"] # Use latest from https://pkgs.alpinelinux.org/packages?name=mysql -ARG mysql_version=10.11.3 +ARG mysql_version=10.11.4 LABEL mysql-version=$mysql_version ENV MYSQL_VERSION=$mysql_version