mirror of
https://github.com/clearlinux/official-images.git
synced 2026-10-04 07:48:51 +00:00
Update tests to Debian Bookworm
This commit is contained in:
+10
-10
@@ -6,7 +6,7 @@
|
||||
$ ./run.sh
|
||||
|
||||
usage: run.sh [-t test ...] image:tag [...]
|
||||
ie: run.sh debian:buster
|
||||
ie: run.sh debian:bookworm
|
||||
run.sh -t utc python:3
|
||||
run.sh -t utc python:3 -t python-hy
|
||||
|
||||
@@ -14,36 +14,36 @@ This script processes the specified Docker images to test their running
|
||||
environments.
|
||||
```
|
||||
|
||||
Run all the tests that are applicable to the `debian:buster` image:
|
||||
Run all the tests that are applicable to the `debian:bookworm` image:
|
||||
|
||||
```console
|
||||
$ ./run.sh debian:buster
|
||||
testing debian:buster
|
||||
$ ./run.sh debian:bookworm
|
||||
testing debian:bookworm
|
||||
'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-hy` test against the `debian:buster` image: (which doesn't contain Python)
|
||||
Try to run just the `python-hy` test against the `debian:bookworm` image: (which doesn't contain Python)
|
||||
|
||||
```console
|
||||
$ ./run.sh -t python-hy debian:buster
|
||||
testing debian:buster
|
||||
$ ./run.sh -t python-hy debian:bookworm
|
||||
testing debian:bookworm
|
||||
image has no tests...skipping
|
||||
```
|
||||
|
||||
Run the `utc` and `python-hy` tests against `python:3`, `pypy:3`, and `debian:buster`:
|
||||
Run the `utc` and `python-hy` tests against `python:3`, `pypy:3`, and `debian:bookworm`:
|
||||
|
||||
```console
|
||||
$ ./run.sh -t utc -t python-hy python:3 pypy:3 debian:buster
|
||||
$ ./run.sh -t utc -t python-hy python:3 pypy:3 debian:bookworm
|
||||
testing python:3
|
||||
'utc' [1/2]...passed
|
||||
'python-hy' [2/2]...passed
|
||||
testing pypy:3
|
||||
'utc' [1/2]...passed
|
||||
'python-hy' [2/2]...passed
|
||||
testing debian:buster
|
||||
testing debian:bookworm
|
||||
'utc' [1/1]...passed
|
||||
```
|
||||
|
||||
|
||||
+2
-2
@@ -9,7 +9,7 @@ usage() {
|
||||
cat <<EOUSAGE
|
||||
|
||||
usage: $self [-t test ...] image:tag [...]
|
||||
ie: $self debian:buster
|
||||
ie: $self debian:bookworm
|
||||
$self -t utc python:3
|
||||
$self -t utc python:3 -t python-hy
|
||||
|
||||
@@ -123,7 +123,7 @@ for dockerImage in "$@"; do
|
||||
variant='alpine'
|
||||
;;
|
||||
slim-*|*-slim-*)
|
||||
# "slim-jessie" is still "slim"
|
||||
# "slim-bookworm" is still "slim"
|
||||
variant='slim'
|
||||
;;
|
||||
psmdb-*)
|
||||
|
||||
@@ -6,7 +6,7 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
|
||||
serverImage="$1"
|
||||
|
||||
# Use a client image with curl for testing
|
||||
clientImage='buildpack-deps:buster-curl'
|
||||
clientImage='buildpack-deps:bookworm-curl'
|
||||
# ensure the clientImage is ready and available
|
||||
if ! docker image inspect "$clientImage" &> /dev/null; then
|
||||
docker pull "$clientImage" > /dev/null
|
||||
|
||||
@@ -6,7 +6,7 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
|
||||
serverImage="$1"
|
||||
|
||||
# Use a client image with curl for testing
|
||||
clientImage='buildpack-deps:buster-curl'
|
||||
clientImage='buildpack-deps:bookworm-curl'
|
||||
# ensure the clientImage is ready and available
|
||||
if ! docker image inspect "$clientImage" &> /dev/null; then
|
||||
docker pull "$clientImage" > /dev/null
|
||||
|
||||
@@ -8,7 +8,7 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
|
||||
|
||||
image="$1"
|
||||
|
||||
clientImage='buildpack-deps:buster-curl'
|
||||
clientImage='buildpack-deps:bookworm-curl'
|
||||
# ensure the clientImage is ready and available
|
||||
if ! docker image inspect "$clientImage" &> /dev/null; then
|
||||
docker pull "$clientImage" > /dev/null
|
||||
|
||||
@@ -9,7 +9,7 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
|
||||
image="$1"
|
||||
|
||||
# Use a client image with curl for testing
|
||||
clientImage='buildpack-deps:buster-curl'
|
||||
clientImage='buildpack-deps:bookworm-curl'
|
||||
# ensure the clientImage is ready and available
|
||||
if ! docker image inspect "$clientImage" &> /dev/null; then
|
||||
docker pull "$clientImage" > /dev/null
|
||||
|
||||
@@ -9,7 +9,7 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
|
||||
image="$1"
|
||||
|
||||
# Use a client image with curl for testing
|
||||
clientImage='buildpack-deps:buster-curl'
|
||||
clientImage='buildpack-deps:bookworm-curl'
|
||||
# ensure the clientImage is ready and available
|
||||
if ! docker image inspect "$clientImage" &> /dev/null; then
|
||||
docker pull "$clientImage" > /dev/null
|
||||
|
||||
@@ -4,7 +4,7 @@ set -eo pipefail
|
||||
dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
|
||||
|
||||
# Use a client image with curl for testing
|
||||
clientImage='buildpack-deps:buster-curl'
|
||||
clientImage='buildpack-deps:bookworm-curl'
|
||||
# ensure the clientImage is ready and available
|
||||
if ! docker image inspect "$clientImage" &> /dev/null; then
|
||||
docker pull "$clientImage" > /dev/null
|
||||
|
||||
@@ -5,7 +5,7 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
|
||||
|
||||
serverImage="$1"
|
||||
|
||||
clientImage='buildpack-deps:buster-curl'
|
||||
clientImage='buildpack-deps:bookworm-curl'
|
||||
# ensure the clientImage is ready and available
|
||||
if ! docker image inspect "$clientImage" &> /dev/null; then
|
||||
docker pull "$clientImage" > /dev/null
|
||||
|
||||
@@ -8,7 +8,7 @@ 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:buster-slim
|
||||
FROM debian:bookworm-slim
|
||||
|
||||
RUN set -x && apt-get update && apt-get install -y --no-install-recommends libfcgi-bin && rm -rf /var/lib/apt/lists/*
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ image="$1"
|
||||
# Build a client image with cgi-fcgi for testing
|
||||
clientImage='librarytest/nextcloud-fpm-run:fcgi-client'
|
||||
docker build -t "$clientImage" - > /dev/null <<'EOF'
|
||||
FROM debian:buster-slim
|
||||
FROM debian:bookworm-slim
|
||||
|
||||
RUN set -x && apt-get update && apt-get install -y --no-install-recommends libfcgi-bin && rm -rf /var/lib/apt/lists/*
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
|
||||
image="$1"
|
||||
|
||||
# Use a client image with curl for testing
|
||||
clientImage='buildpack-deps:buster-curl'
|
||||
clientImage='buildpack-deps:bookworm-curl'
|
||||
# ensure the clientImage is ready and available
|
||||
if ! docker image inspect "$clientImage" &> /dev/null; then
|
||||
docker pull "$clientImage" > /dev/null
|
||||
|
||||
@@ -6,7 +6,7 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
|
||||
image="$1"
|
||||
|
||||
# Use a client image with curl for testing
|
||||
clientImage='buildpack-deps:buster-curl'
|
||||
clientImage='buildpack-deps:bookworm-curl'
|
||||
# ensure the clientImage is ready and available
|
||||
if ! docker image inspect "$clientImage" &> /dev/null; then
|
||||
docker pull "$clientImage" > /dev/null
|
||||
|
||||
@@ -4,7 +4,7 @@ set -eo pipefail
|
||||
dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
|
||||
|
||||
# Use a client image with curl for testing
|
||||
clientImage='buildpack-deps:buster-curl'
|
||||
clientImage='buildpack-deps:bookworm-curl'
|
||||
# ensure the clientImage is ready and available
|
||||
if ! docker image inspect "$clientImage" &> /dev/null; then
|
||||
docker pull "$clientImage" > /dev/null
|
||||
|
||||
@@ -9,7 +9,7 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
|
||||
image="$1"
|
||||
|
||||
# Use a client image with curl for testing
|
||||
clientImage='buildpack-deps:buster-curl'
|
||||
clientImage='buildpack-deps:bookworm-curl'
|
||||
# ensure the clientImage is ready and available
|
||||
if ! docker image inspect "$clientImage" &> /dev/null; then
|
||||
docker pull "$clientImage" > /dev/null
|
||||
|
||||
@@ -9,7 +9,7 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
|
||||
image="$1"
|
||||
|
||||
# Use a client image with curl for testing
|
||||
clientImage='buildpack-deps:buster-curl'
|
||||
clientImage='buildpack-deps:bookworm-curl'
|
||||
# ensure the clientImage is ready and available
|
||||
if ! docker image inspect "$clientImage" &> /dev/null; then
|
||||
docker pull "$clientImage" > /dev/null
|
||||
|
||||
@@ -6,7 +6,7 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
|
||||
serverImage="$1"
|
||||
|
||||
# Use a client image with curl for testing
|
||||
clientImage='buildpack-deps:buster-curl'
|
||||
clientImage='buildpack-deps:bookworm-curl'
|
||||
# ensure the clientImage is ready and available
|
||||
if ! docker image inspect "$clientImage" &> /dev/null; then
|
||||
docker pull "$clientImage" > /dev/null
|
||||
|
||||
@@ -6,7 +6,7 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
|
||||
image="$1"
|
||||
|
||||
# Use a client image with curl for testing
|
||||
clientImage='buildpack-deps:buster-curl'
|
||||
clientImage='buildpack-deps:bookworm-curl'
|
||||
# ensure the clientImage is ready and available
|
||||
if ! docker image inspect "$clientImage" &> /dev/null; then
|
||||
docker pull "$clientImage" > /dev/null
|
||||
|
||||
@@ -8,7 +8,7 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
|
||||
|
||||
image="$1"
|
||||
|
||||
clientImage='buildpack-deps:buster-curl'
|
||||
clientImage='buildpack-deps:bookworm-curl'
|
||||
# ensure the clientImage is ready and available
|
||||
if ! docker image inspect "$clientImage" &> /dev/null; then
|
||||
docker pull "$clientImage" > /dev/null
|
||||
|
||||
@@ -6,7 +6,7 @@ dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
|
||||
image="$1"
|
||||
|
||||
# Use a client image with curl for testing
|
||||
clientImage='buildpack-deps:buster-curl'
|
||||
clientImage='buildpack-deps:bookworm-curl'
|
||||
# ensure the clientImage is ready and available
|
||||
if ! docker image inspect "$clientImage" &> /dev/null; then
|
||||
docker pull "$clientImage" > /dev/null
|
||||
|
||||
@@ -4,7 +4,7 @@ set -eo pipefail
|
||||
dir="$(dirname "$(readlink -f "$BASH_SOURCE")")"
|
||||
|
||||
# Use a client image with curl for testing
|
||||
clientImage='buildpack-deps:buster-curl'
|
||||
clientImage='buildpack-deps:bookworm-curl'
|
||||
# ensure the clientImage is ready and available
|
||||
if ! docker image inspect "$clientImage" &> /dev/null; then
|
||||
docker pull "$clientImage" > /dev/null
|
||||
|
||||
Reference in New Issue
Block a user