Merge branch 'bump-debian-versions-where-possible' into 'master'

Debian based base images where possible See merge request divio/cloud/base-images!36
divio · Nov 29, 2024 · 4c9acf7 · 4c9acf7
2 parents 2efbee8 + e917cb3
commit 4c9acf7
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 7 deletions.
diff --git a/py3.9-slim-buster/CHANGELOG.rst → EOL-py3.9-slim-buster/CHANGELOG.rst b/py3.9-slim-buster/CHANGELOG.rst → EOL-py3.9-slim-buster/CHANGELOG.rst
diff --git a/py3.9-slim-buster/Dockerfile → EOL-py3.9-slim-buster/Dockerfile b/py3.9-slim-buster/Dockerfile → EOL-py3.9-slim-buster/Dockerfile
diff --git a/...-slim-buster/add_addons_dev_to_syspath.py → ...-slim-buster/add_addons_dev_to_syspath.py b/...-slim-buster/add_addons_dev_to_syspath.py → ...-slim-buster/add_addons_dev_to_syspath.py
diff --git a/Makefile b/Makefile
@@ -1,5 +1,13 @@
+IMAGES=$(shell ls -d py*)
+
+
 lint:
 	find . -type f -name Dockerfile -not -path './EOL-*' -print0 | \
 	xargs -0 -I% \
 	docker run -v $(shell pwd):/app -e LINT_FILE_DOCKER=% divio/lint \
 	/bin/lint --run=docker
+
+test:
+	echo $(IMAGES) | tr " " "\n" | xargs -I '{}' ./build.py --repo divio/base --target=prod --tag test-{} build
+	echo $(IMAGES) | tr " " "\n" | xargs -I '{}' ./build.py --repo divio/base --target=dev --tag test-{} build
+	echo $(IMAGES) | tr " " "\n" | xargs --open-tty -I '{}' ./build.py --repo divio/base --target=dev --tag test-{} test
diff --git a/README.md b/README.md
@@ -19,14 +19,16 @@ DOCKER_DEFAULT_PLATFORM=linux/arm64 ./build.py --repo divio/base --tag 1.1-py3.1
 
 Check `./build.py --help` for additional information.
 
-## Test all images
+## Test images
 
-You can build and test all images locally by running:
+You can build and test all, or specified, images locally by running:
 
 ```bash
-ls -d py* | xargs -I '{}' ./build.py --repo divio/base --target=prod --tag test-{} build
-ls -d py* | xargs -I '{}' ./build.py --repo divio/base --target=dev --tag test-{} build
-ls -d py* | xargs --open-tty -I '{}' ./build.py --repo divio/base --target=dev --tag test-{} test
+# test all images
+make test
+
+# only test specific images
+make test IMAGES="py3.12-alpine3.19 py3.11-slim-bookworm"
 ```
 
 ## Release process

diff --git a/py3.10-slim-bullseye/Dockerfile b/py3.10-slim-bullseye/Dockerfile
@@ -1,5 +1,5 @@
 # hadolint global ignore=DL3059
-FROM python:3.10.13-slim-bullseye AS build
+FROM python:3.10.15-slim-bullseye AS build
 
 ARG TARGET=prod
 ARG TARGETARCH

diff --git a/py3.9-slim-bookworm/Dockerfile b/py3.9-slim-bookworm/Dockerfile
@@ -1,5 +1,5 @@
 # hadolint global ignore=DL3059
-FROM python:3.9.17-slim-bookworm AS build
+FROM python:3.9.20-slim-bookworm AS build
 
 ARG TARGET=prod
 ARG TARGETARCH