From 6b08c21a5685bc113beb656de932593ac370eb42 Mon Sep 17 00:00:00 2001 From: Julian Gamble Date: Wed, 19 Apr 2023 21:45:04 +1000 Subject: [PATCH 1/5] Python resilience in base image - particularly on M1 - MacOS ARM - Ventura --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5756a2e..45ec423 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:2.7-alpine3.8 +FROM python:2.7 WORKDIR /scripts From 51314291a32e7259952c8e745e5909b2134fe9ef Mon Sep 17 00:00:00 2001 From: Julian Gamble Date: Wed, 19 Apr 2023 21:45:58 +1000 Subject: [PATCH 2/5] Make cqlsh version match that in latest cassandra image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 45ec423..0364f84 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM python:2.7 WORKDIR /scripts -ENV CQLVERSION="3.4.4" \ +ENV CQLVERSION="3.4.6" \ CQLSH_HOST="cassandra" \ CQLSH_PORT="9042" From 4fbad54cce9b336b7bf21e28607e416a638316d4 Mon Sep 17 00:00:00 2001 From: Julian Gamble Date: Wed, 19 Apr 2023 21:47:10 +1000 Subject: [PATCH 3/5] remove redundant bash install - no longer required/works if not on Alpine --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0364f84..33f3b0e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,6 @@ ENV CQLVERSION="3.4.6" \ CQLSH_PORT="9042" RUN pip install -Ivq cqlsh==5.0.4 \ - && apk add --no-cache bash \ && echo 'alias cqlsh="cqlsh --cqlversion ${CQLVERSION} $@"' >> /.bashrc \ && mkdir /.cassandra From 763b71b5e90ffbd613ee527eed18948e786345f6 Mon Sep 17 00:00:00 2001 From: Julian Gamble Date: Wed, 19 Apr 2023 21:48:41 +1000 Subject: [PATCH 4/5] Update cqlsh version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 33f3b0e..ba59d18 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ENV CQLVERSION="3.4.6" \ CQLSH_HOST="cassandra" \ CQLSH_PORT="9042" -RUN pip install -Ivq cqlsh==5.0.4 \ +RUN pip install -Ivq cqlsh==6.0.0 \ && echo 'alias cqlsh="cqlsh --cqlversion ${CQLVERSION} $@"' >> /.bashrc \ && mkdir /.cassandra From 17efb043fb53f0eeb51d9331f0a5b4d1dfbb2176 Mon Sep 17 00:00:00 2001 From: Julian Gamble Date: Wed, 19 Apr 2023 21:49:34 +1000 Subject: [PATCH 5/5] Add library for cqlsh required on python 2.7 --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index ba59d18..6833b02 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,7 @@ ENV CQLVERSION="3.4.6" \ CQLSH_PORT="9042" RUN pip install -Ivq cqlsh==6.0.0 \ + pip install futures \ && echo 'alias cqlsh="cqlsh --cqlversion ${CQLVERSION} $@"' >> /.bashrc \ && mkdir /.cassandra