Merge pull request #19984 from J0WI/trixie-tests

tianon · web-flow · commit 5943ecba4713 · 2025-09-29T16:37:28.000-07:00
Update tests to Debian Trixie
diff --git a/test/README.md b/test/README.md
@@ -6,44 +6,44 @@
 $ ./run.sh
 
 usage: run.sh [-t test ...] image:tag [...]
-   ie: run.sh debian:bookworm
+   ie: run.sh debian:trixie
        run.sh -t utc python:3
        run.sh -t utc python:3 -t python-imports
 
 This script processes the specified Docker images to test their running
 environments.
 ```
 
-Run all the tests that are applicable to the `debian:bookworm` image:
+Run all the tests that are applicable to the `debian:trixie` image:
 
 ```console
-$ ./run.sh debian:bookworm
-testing debian:bookworm
+$ ./run.sh debian:trixie
+testing debian:trixie
 	'utc' [1/4]...passed
 	'no-hard-coded-passwords' [2/4]...passed
 	'override-cmd' [3/4]...passed
 	'debian-apt-get' [4/4]...passed
 ```
 
-Try to run just the `python-imports` test against the `debian:bookworm` image: (which doesn't contain Python)
+Try to run just the `python-imports` test against the `debian:trixie` image: (which doesn't contain Python)
 
 ```console
-$ ./run.sh -t python-imports debian:bookworm
-testing debian:bookworm
+$ ./run.sh -t python-imports debian:trixie
+testing debian:trixie
 	image has no tests...skipping
 ```
 
-Run the `utc` and `python-imports` tests against `python:3`, `pypy:3`, and `debian:bookworm`:
+Run the `utc` and `python-imports` tests against `python:3`, `pypy:3`, and `debian:trixie`:
 
 ```console
-$ ./run.sh -t utc -t python-imports python:3 pypy:3 debian:bookworm
+$ ./run.sh -t utc -t python-imports python:3 pypy:3 debian:trixie
 testing python:3
 	'utc' [1/2]...passed
 	'python-imports' [2/2]...passed
 testing pypy:3
 	'utc' [1/2]...passed
 	'python-imports' [2/2]...passed
-testing debian:bookworm
+testing debian:trixie
 	'utc' [1/1]...passed
 ```
 
diff --git a/test/run.sh b/test/run.sh
@@ -9,7 +9,7 @@ usage() {
 	cat <<EOUSAGE
 
 usage: $self [-t test ...] image:tag [...]
-   ie: $self debian:bookworm
+   ie: $self debian:trixie
        $self -t utc python:3
        $self -t utc python:3 -t python-imports
 
@@ -123,7 +123,7 @@ for dockerImage in "$@"; do
 			variant='alpine'
 			;;
 		slim-*|*-slim-*)
-			# "slim-bookworm" is still "slim"
+			# "slim-trixie" is still "slim"
 			variant='slim'
 			;;
 		psmdb-*)
diff --git a/test/tests/convertigo-hello-world/run.sh b/test/tests/convertigo-hello-world/run.sh
@@ -6,7 +6,7 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
 serverImage="$1"
 
 # Use a client image with curl for testing
-clientImage='buildpack-deps:bookworm-curl'
+clientImage='buildpack-deps:trixie-curl'
 # ensure the clientImage is ready and available
 if ! docker image inspect "$clientImage" &> /dev/null; then
 	docker pull "$clientImage" > /dev/null
diff --git a/test/tests/ghost-basics/run.sh b/test/tests/ghost-basics/run.sh
@@ -6,7 +6,7 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
 serverImage="$1"
 
 # Use a client image with curl for testing
-clientImage='buildpack-deps:bookworm-curl'
+clientImage='buildpack-deps:trixie-curl'
 # ensure the clientImage is ready and available
 if ! docker image inspect "$clientImage" &> /dev/null; then
 	docker pull "$clientImage" > /dev/null
diff --git a/test/tests/haproxy-basics/run.sh b/test/tests/haproxy-basics/run.sh
@@ -8,7 +8,7 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
 
 image="$1"
 
-clientImage='buildpack-deps:bookworm-curl'
+clientImage='buildpack-deps:trixie-curl'
 # ensure the clientImage is ready and available
 if ! docker image inspect "$clientImage" &> /dev/null; then
 	docker pull "$clientImage" > /dev/null
diff --git a/test/tests/jetty-hello-web/run.sh b/test/tests/jetty-hello-web/run.sh
@@ -9,7 +9,7 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
 image="$1"
 
 # Use a client image with curl for testing
-clientImage='buildpack-deps:bookworm-curl'
+clientImage='buildpack-deps:trixie-curl'
 # ensure the clientImage is ready and available
 if ! docker image inspect "$clientImage" &> /dev/null; then
 	docker pull "$clientImage" > /dev/null
diff --git a/test/tests/logstash-basics/run.sh b/test/tests/logstash-basics/run.sh
@@ -9,7 +9,7 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
 image="$1"
 
 # Use a client image with curl for testing
-clientImage='buildpack-deps:bookworm-curl'
+clientImage='buildpack-deps:trixie-curl'
 # ensure the clientImage is ready and available
 if ! docker image inspect "$clientImage" &> /dev/null; then
 	docker pull "$clientImage" > /dev/null
diff --git a/test/tests/matomo-apache-run/run.sh b/test/tests/matomo-apache-run/run.sh
@@ -4,7 +4,7 @@ set -eo pipefail
 dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
 
 # Use a client image with curl for testing
-clientImage='buildpack-deps:bookworm-curl'
+clientImage='buildpack-deps:trixie-curl'
 # ensure the clientImage is ready and available
 if ! docker image inspect "$clientImage" &> /dev/null; then
 	docker pull "$clientImage" > /dev/null
diff --git a/test/tests/mongo-express-run/run.sh b/test/tests/mongo-express-run/run.sh
@@ -5,7 +5,7 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
 
 serverImage="$1"
 
-clientImage='buildpack-deps:bookworm-curl'
+clientImage='buildpack-deps:trixie-curl'
 # ensure the clientImage is ready and available
 if ! docker image inspect "$clientImage" &> /dev/null; then
 	docker pull "$clientImage" > /dev/null
diff --git a/test/tests/monica-fpm-run/run.sh b/test/tests/monica-fpm-run/run.sh
@@ -8,9 +8,9 @@ image="$1"
 # Build a client image with cgi-fcgi for testing
 clientImage="librarytest/monica-fpm-run:fcgi-client"
 docker build -t "$clientImage" - > /dev/null <<'EOF'
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
 
-RUN set -x && apt-get update && apt-get install -y --no-install-recommends libfcgi-bin && rm -rf /var/lib/apt/lists/*
+RUN set -x && apt-get update && apt-get install -y --no-install-recommends libfcgi-bin && apt-get dist-clean
 
 ENTRYPOINT ["cgi-fcgi"]
 EOF
diff --git a/test/tests/open-liberty-hello-world/run.sh b/test/tests/open-liberty-hello-world/run.sh
@@ -6,7 +6,7 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
 image="$1"
 
 # Use a client image with curl for testing
-clientImage='buildpack-deps:bookworm-curl'
+clientImage='buildpack-deps:trixie-curl'
 # ensure the clientImage is ready and available
 if ! docker image inspect "$clientImage" &> /dev/null; then
 	docker pull "$clientImage" > /dev/null
diff --git a/test/tests/php-apache-hello-web/run.sh b/test/tests/php-apache-hello-web/run.sh
@@ -6,7 +6,7 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
 image="$1"
 
 # Use a client image with curl for testing
-clientImage='buildpack-deps:bookworm-curl'
+clientImage='buildpack-deps:trixie-curl'
 # ensure the clientImage is ready and available
 if ! docker image inspect "$clientImage" &> /dev/null; then
 	docker pull "$clientImage" > /dev/null
diff --git a/test/tests/php-fpm-hello-web/run.sh b/test/tests/php-fpm-hello-web/run.sh
@@ -8,9 +8,9 @@ image="$1"
 # Build a client image with cgi-fcgi for testing
 clientImage='librarytest/php-fpm-hello-web:fcgi-client'
 docker build -t "$clientImage" - > /dev/null <<'EOF'
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
 
-RUN set -x && apt-get update && apt-get install -y --no-install-recommends libfcgi-bin && rm -rf /var/lib/apt/lists/*
+RUN set -x && apt-get update && apt-get install -y --no-install-recommends libfcgi-bin && apt-get dist-clean
 
 ENTRYPOINT ["cgi-fcgi"]
 EOF
diff --git a/test/tests/postfixadmin-apache-run/run.sh b/test/tests/postfixadmin-apache-run/run.sh
@@ -4,7 +4,7 @@ set -eo pipefail
 dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
 
 # Use a client image with curl for testing
-clientImage='buildpack-deps:bookworm-curl'
+clientImage='buildpack-deps:trixie-curl'
 # ensure the clientImage is ready and available
 if ! docker image inspect "$clientImage" &> /dev/null; then
 	docker pull "$clientImage" > /dev/null
diff --git a/test/tests/postfixadmin-fpm-run/run.sh b/test/tests/postfixadmin-fpm-run/run.sh
@@ -8,9 +8,9 @@ image="$1"
 # Build a client image with cgi-fcgi for testing
 clientImage='librarytest/posfixadmin-fpm-run:fcgi-client'
 docker build -t "$clientImage" - > /dev/null <<'EOF'
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
 
-RUN set -x && apt-get update && apt-get install -y --no-install-recommends libfcgi-bin && rm -rf /var/lib/apt/lists/*
+RUN set -x && apt-get update && apt-get install -y --no-install-recommends libfcgi-bin && apt-get dist-clean
 
 ENTRYPOINT ["cgi-fcgi"]
 EOF
diff --git a/test/tests/redmine-basics/run.sh b/test/tests/redmine-basics/run.sh
@@ -6,7 +6,7 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
 serverImage="$1"
 
 # Use a client image with curl for testing
-clientImage='buildpack-deps:bookworm-curl'
+clientImage='buildpack-deps:trixie-curl'
 # ensure the clientImage is ready and available
 if ! docker image inspect "$clientImage" &> /dev/null; then
 	docker pull "$clientImage" > /dev/null
diff --git a/test/tests/ruby-native-extension/run.sh b/test/tests/ruby-native-extension/run.sh
@@ -24,7 +24,7 @@ if ! docker run --rm --entrypoint sh "$image" -c 'command -v gcc' > /dev/null; t
 				RUN set -eux; \
 					apt-get update; \
 					apt-get install -y --no-install-recommends gcc make libc6-dev; \
-					rm -rf /var/lib/apt/lists/*
+					apt-get dist-clean
 			EOD
 			;;
 	esac
diff --git a/test/tests/silverpeas-basics/run.sh b/test/tests/silverpeas-basics/run.sh
@@ -6,7 +6,7 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
 image="$1"
 
 # Use a client image with curl for testing
-clientImage='buildpack-deps:bookworm-curl'
+clientImage='buildpack-deps:trixie-curl'
 # ensure the clientImage is ready and available
 if ! docker image inspect "$clientImage" &> /dev/null; then
 	docker pull "$clientImage" > /dev/null
diff --git a/test/tests/spiped-basics/run.sh b/test/tests/spiped-basics/run.sh
@@ -8,7 +8,7 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
 
 image="$1"
 
-clientImage='buildpack-deps:bookworm-curl'
+clientImage='buildpack-deps:trixie-curl'
 # ensure the clientImage is ready and available
 if ! docker image inspect "$clientImage" &> /dev/null; then
 	docker pull "$clientImage" > /dev/null
diff --git a/test/tests/tomcat-hello-world/run.sh b/test/tests/tomcat-hello-world/run.sh
@@ -6,7 +6,7 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
 image="$1"
 
 # Use a client image with curl for testing
-clientImage='buildpack-deps:bookworm-curl'
+clientImage='buildpack-deps:trixie-curl'
 # ensure the clientImage is ready and available
 if ! docker image inspect "$clientImage" &> /dev/null; then
 	docker pull "$clientImage" > /dev/null
diff --git a/test/tests/wordpress-apache-run/run.sh b/test/tests/wordpress-apache-run/run.sh
@@ -4,7 +4,7 @@ set -eo pipefail
 dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
 
 # Use a client image with curl for testing
-clientImage='buildpack-deps:bookworm-curl'
+clientImage='buildpack-deps:trixie-curl'
 # ensure the clientImage is ready and available
 if ! docker image inspect "$clientImage" &> /dev/null; then
 	docker pull "$clientImage" > /dev/null
diff --git a/test/tests/wordpress-fpm-run/run.sh b/test/tests/wordpress-fpm-run/run.sh
@@ -8,9 +8,9 @@ image="$1"
 # Build a client image with cgi-fcgi for testing
 clientImage='librarytest/wordpress-fpm-run:fcgi-client'
 docker build -t "$clientImage" - > /dev/null <<'EOF'
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
 
-RUN set -x && apt-get update && apt-get install -y --no-install-recommends libfcgi-bin && rm -rf /var/lib/apt/lists/*
+RUN set -x && apt-get update && apt-get install -y --no-install-recommends libfcgi-bin && apt-get dist-clean
 
 ENTRYPOINT ["cgi-fcgi"]
 EOF
