diff --git a/Makefile b/Makefile index 6113e55..6cc13ef 100644 --- a/Makefile +++ b/Makefile @@ -24,14 +24,14 @@ tinyproxy: cloudsql-proxy: docker build ./cloudsql-proxy -t europe-west2-docker.pkg.dev/ssdc-rm-ci/docker/cloudsql-proxy:latest -python-pipenv: python-pipenv-3.11 +python-pipenv: python-pipenv-3.12 + +python-pipenv-3.12: + docker build --build-arg="PYTHON_TAG=$$(cat python-pipenv/python-3.12-tag.txt)" ./python-pipenv -t europe-west2-docker.pkg.dev/ons-ci-rm/docker/python-pipenv:3.12 python-pipenv-3.11: docker build --build-arg="PYTHON_TAG=$$(cat python-pipenv/python-3.11-tag.txt)" ./python-pipenv -t europe-west2-docker.pkg.dev/ons-ci-rm/docker/python-pipenv:3.11 -python-pipenv-3.10: - docker build --build-arg="PYTHON_TAG=$$(cat python-pipenv/python-3.10-tag.txt)" ./python-pipenv -t europe-west2-docker.pkg.dev/ons-ci-rm/docker/python-pipenv:3.10 - cloud-sdk-terraform: docker build ./cloud-sdk-terraform -t europe-west2-docker.pkg.dev/ssdc-rm-ci/docker/cloud-sdk-terraform:latest @@ -41,4 +41,4 @@ eq-stub: owasp-venom: docker build ./owasp-venom -t europe-west2-docker.pkg.dev/ssdc-rm-ci/docker/venom:latest -build-all: jdk17-maven-node16 gcloud-pubsub-emulator gcloud-firestore-emulator modsecurity cloud-sdk-firebase-cli tinyproxy cloudsql-proxy python-pipenv-3.10 python-pipenv-3.11 cloud-sdk-terraform eq-stub owasp-venom +build-all: jdk17-maven-node16 gcloud-pubsub-emulator gcloud-firestore-emulator modsecurity cloud-sdk-firebase-cli tinyproxy cloudsql-proxy python-pipenv-3.11 python-pipenv-3.12 cloud-sdk-terraform eq-stub owasp-venom diff --git a/README.md b/README.md index 46d2f5e..d4b9aac 100644 --- a/README.md +++ b/README.md @@ -92,8 +92,8 @@ time dependencies such as `gcc` built in. Currently, we maintain it for these python versions: -- 3.10 - 3.11 +- 3.12 To update the python base versions, update the relevant `python-3.x-tag.txt` file, ensuring you use the `slim` image and pin it to the SHA digest explicitly. diff --git a/python-pipenv/python-3.10-tag.txt b/python-pipenv/python-3.10-tag.txt deleted file mode 100644 index 26e8d15..0000000 --- a/python-pipenv/python-3.10-tag.txt +++ /dev/null @@ -1 +0,0 @@ -3.10.13-slim@sha256:fb6e9cde0d7ae6ea8cd516a76ba78dad72e6a09465a8e93fe847d63fbcebc9a6 \ No newline at end of file diff --git a/python-pipenv/python-3.12-tag.txt b/python-pipenv/python-3.12-tag.txt new file mode 100644 index 0000000..cb94d26 --- /dev/null +++ b/python-pipenv/python-3.12-tag.txt @@ -0,0 +1 @@ +3.12.5-slim@sha256:59c7332a4a24373861c4a5f0eec2c92b87e3efeb8ddef011744ef9a751b1d11c \ No newline at end of file