nomad
/
common
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rebuild base images for 24.5

This commit is contained in:
Daniel Berteaud 2024-05-02 12:25:51 +02:00
parent 53cf83022c
commit 1fab15727a
15 changed files with 186 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
example/base_images.nomad.hcl
View File

@ -4,8 +4,6 @@ job "base_images" {
region = "global"
# Note : This is not a job to run
# Just a dummy job file for ctctl to be able to easily build base images
# So just set a constrain to be sure the job can't run
@ -18,115 +16,115 @@ job "base_images" {
task "alma8" {
driver = "docker"
config {
image = "danielberteaud/alma:8.24.4-1"
image = "danielberteaud/alma:8.24.5-1"
}
}
task "alma9" {
driver = "docker"
config {
image = "danielberteaud/alma:9.24.4-1"
image = "danielberteaud/alma:9.24.5-1"
}
}
task "alpine" {
driver = "docker"
config {
image = "danielberteaud/alpine:24.4-1"
image = "danielberteaud/alpine:24.5-1"
}
}
task "java11" {
driver = "docker"
config {
image = "danielberteaud/java:11.24.4-1"
image = "danielberteaud/java:11.24.5-1"
}
}
task "java17" {
driver = "docker"
config {
image = "danielberteaud/java:17.24.4-1"
image = "danielberteaud/java:17.24.5-1"
}
}
task "java21" {
driver = "docker"
config {
image = "danielberteaud/java:21.24.4-1"
image = "danielberteaud/java:21.24.5-1"
}
}
task "java8" {
driver = "docker"
config {
image = "danielberteaud/java:8.24.4-1"
image = "danielberteaud/java:8.24.5-1"
}
}
task "mariadb" {
driver = "docker"
config {
image = "danielberteaud/mariadb:24.4-1"
image = "danielberteaud/mariadb:24.5-1"
}
}
task "mariadb_client" {
driver = "docker"
config {
image = "danielberteaud/mariadb-client:24.4-1"
image = "danielberteaud/mariadb-client:24.5-1"
}
}
task "mongo50" {
driver = "docker"
config {
image = "danielberteaud/mongo:5.0.24.4-1"
image = "danielberteaud/mongo:5.0.24.5-1"
}
}
task "pgbouncer" {
driver = "docker"
config {
image = "danielberteaud/pgbouncer:24.4-1"
image = "danielberteaud/pgbouncer:24.5-1"
}
}
task "php82" {
driver = "docker"
config {
image = "danielberteaud/php:82.24.4-1"
image = "danielberteaud/php:82.24.5-1"
}
}
task "php83" {
driver = "docker"
config {
image = "danielberteaud/php:83.24.4-1"
image = "danielberteaud/php:83.24.5-1"
}
}
task "postgres15" {
driver = "docker"
config {
image = "danielberteaud/postgres:15.24.4-1"
image = "danielberteaud/postgres:15.24.5-1"
}
}
task "postgres16" {
driver = "docker"
config {
image = "danielberteaud/postgres:16.24.4-1"
image = "danielberteaud/postgres:16.24.5-1"
}
}
task "sqlite" {
driver = "docker"
config {
image = "danielberteaud/sqlite:24.4-1"
image = "danielberteaud/sqlite:24.5-1"
}
}
task "valkey" {
driver = "docker"
config {
image = "danielberteaud/valkey:24.4-1"
image = "danielberteaud/valkey:24.5-1"
}
}
task "wait_for" {
driver = "docker"
config {
image = "danielberteaud/wait-for:24.4-1"
image = "danielberteaud/wait-for:24.5-1"
}
}
task "wkhtmltopdf" {
driver = "docker"
config {
image = "danielberteaud/wkhtmltopdf:24.4-1"
image = "danielberteaud/wkhtmltopdf:24.5-1"
}
}
}

2
example/images/alma/Dockerfile
View File

@ -24,7 +24,7 @@ RUN set -x &&\
busybox --install &&\
rm -rf /var/cache/yum/* /var/log/yum/* /var/lib/dnf/history*
COPY --from=danielberteaud/alpine:24.4-1 /usr/local/bin/minit /usr/local/bin/minit
COPY --from=danielberteaud/alpine:24.5-1 /usr/local/bin/minit /usr/local/bin/minit
COPY root/ /
ENTRYPOINT ["tini", "--", "/entrypoint.sh"]

2
example/images/java/Dockerfile
View File

@ -24,7 +24,7 @@ RUN set -euxo pipefail &&\
mkdir /jmx_exporter &&\
curl -sSL https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/${JMX_EXPORTER_VERSION}/jmx_prometheus_javaagent-${JMX_EXPORTER_VERSION}.jar -o /jmx_exporter/jmx_prometheus_javaagent.jar
COPY root/ /
COPY --from=danielberteaud/alpine:24.4-1 /usr/local/bin/minit /usr/local/bin/minit
COPY --from=danielberteaud/alpine:24.5-1 /usr/local/bin/minit /usr/local/bin/minit
ENTRYPOINT ["tini", "--", "/entrypoint.sh"]
CMD ["sh"]

2
example/images/logrotate/Dockerfile
View File

@ -1,4 +1,4 @@
FROM danielberteaud/alpine:24.4-1
FROM danielberteaud/alpine:24.5-1
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
ENV LOGROTATE_CONFIG=/etc/logrotate.conf \

2
example/images/mariadb-client/Dockerfile
View File

@ -1,4 +1,4 @@
FROM danielberteaud/alpine:24.4-1
FROM danielberteaud/alpine:24.5-1
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
RUN set -eux &&\

2
example/images/mariadb/Dockerfile
View File

@ -1,4 +1,4 @@
FROM danielberteaud/mariadb-client:24.4-1
FROM danielberteaud/mariadb-client:24.5-1
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
ENV MYSQL_CONF_10_section=mysqld \

2
example/images/mongo/Dockerfile
View File

@ -1,4 +1,4 @@
FROM danielberteaud/alma:8.24.4-1
FROM danielberteaud/alma:8.24.5-1
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
ARG MONGO_MAJOR=3.6 \

2
example/images/pgbouncer/Dockerfile
View File

@ -1,4 +1,4 @@
FROM danielberteaud/alpine:24.4-1
FROM danielberteaud/alpine:24.5-1
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
RUN set -euxo pipefail &&\

2
example/images/php/Dockerfile
View File

@ -1,4 +1,4 @@
FROM danielberteaud/alpine:24.4-1
FROM danielberteaud/alpine:24.5-1
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
ARG PHP_VERSION=83

4
example/images/postgres/Dockerfile
View File

@ -1,4 +1,4 @@
FROM danielberteaud/alma:9.24.4-1 AS pgvectors
FROM danielberteaud/alma:9.24.5-1 AS pgvectors
ARG PG_VERSION=15 \
PGVECTORS_VERSION=0.2.1
@ -32,7 +32,7 @@ RUN set -eux &&\
cp sql/upgrade/*.sql /usr/pgsql-${PG_VERSION}/share/extension/
FROM danielberteaud/alma:9.24.4-1
FROM danielberteaud/alma:9.24.5-1
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
ARG PG_VERSION

4
example/images/postgres/Dockerfile.alpine
View File

@ -33,7 +33,7 @@
# apk del build-deps
FROM danielberteaud/alpine:24.4-1 AS pgbackrest
FROM danielberteaud/alpine:24.5-1 AS pgbackrest
ARG PGBACKREST_VERSION=2.48
@ -65,7 +65,7 @@ RUN set -eux &&\
chmod 755 /usr/local/bin/pgbackrest &&\
apk del build-deps
FROM danielberteaud/alpine:24.4-1
FROM danielberteaud/alpine:24.5-1
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
ARG PG_VERSION=15

2
example/images/sqlite/Dockerfile
View File

@ -1,4 +1,4 @@
FROM danielberteaud/alpine:24.4-1
FROM danielberteaud/alpine:24.5-1
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
RUN set -eux &&\

4
example/images/wkhtmltopdf/Dockerfile
View File

@ -1,4 +1,4 @@
FROM danielberteaud/alpine:24.4-1 AS builder
FROM danielberteaud/alpine:24.5-1 AS builder
ARG WKHTMLTOX_VERSION=0.12.6
@ -165,7 +165,7 @@ RUN set -eu \
rm -rf /tmp/* &&\
apk del .build-deps
FROM danielberteaud/alpine:24.4-1
FROM danielberteaud/alpine:24.5-1
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
RUN set -eux &&\

266
example/prep.d/build_base_images.sh
View File

@ -4,358 +4,358 @@
set -euo pipefail
function build_alma8 {
if [ "${IMAGE_ALMA8_AVAILABLE:-0}" = "1" ]; then
echo "Image danielberteaud/alma:8.24.4-1 already available"
echo "Image danielberteaud/alma:8.24.5-1 already available"
return
fi
# Image alma8 depends on alpine
build_alpine
if ! docker manifest inspect danielberteaud/alma:8.24.4-1 > /dev/null 2>&1; then
echo "Building alma:8.24.4-1"
if ! docker manifest inspect danielberteaud/alma:8.24.5-1 > /dev/null 2>&1; then
echo "Building alma:8.24.5-1"
export BUILDKIT_PROGRESS=plain
docker build -t danielberteaud/alma:8.24.4-1 -t danielberteaud/alma8:latest -t danielberteaud/alma:8 --build-arg=ALMA=8 output/images/alma &&\
docker push danielberteaud/alma:8.24.4-1 &&\
docker build -t danielberteaud/alma:8.24.5-1 -t danielberteaud/alma8:latest -t danielberteaud/alma:8 --build-arg=ALMA=8 output/images/alma &&\
docker push danielberteaud/alma:8.24.5-1 &&\
docker push danielberteaud/alma8:latest &&\
docker push danielberteaud/alma:8 &&\
echo "danielberteaud/alma:8.24.4-1 pushed to remote repo"
echo "danielberteaud/alma:8.24.5-1 pushed to remote repo"
else
echo "Image danielberteaud/alma:8.24.4-1 already available"
echo "Image danielberteaud/alma:8.24.5-1 already available"
fi
IMAGE_ALMA8_AVAILABLE=1
}
function build_alma9 {
if [ "${IMAGE_ALMA9_AVAILABLE:-0}" = "1" ]; then
echo "Image danielberteaud/alma:9.24.4-1 already available"
echo "Image danielberteaud/alma:9.24.5-1 already available"
return
fi
# Image alma9 depends on alpine
build_alpine
if ! docker manifest inspect danielberteaud/alma:9.24.4-1 > /dev/null 2>&1; then
echo "Building alma:9.24.4-1"
if ! docker manifest inspect danielberteaud/alma:9.24.5-1 > /dev/null 2>&1; then
echo "Building alma:9.24.5-1"
export BUILDKIT_PROGRESS=plain
docker build -t danielberteaud/alma:9.24.4-1 -t danielberteaud/alma9:latest -t danielberteaud/alma:9 --build-arg=ALMA=9 output/images/alma &&\
docker push danielberteaud/alma:9.24.4-1 &&\
docker build -t danielberteaud/alma:9.24.5-1 -t danielberteaud/alma9:latest -t danielberteaud/alma:9 --build-arg=ALMA=9 output/images/alma &&\
docker push danielberteaud/alma:9.24.5-1 &&\
docker push danielberteaud/alma9:latest &&\
docker push danielberteaud/alma:9 &&\
echo "danielberteaud/alma:9.24.4-1 pushed to remote repo"
echo "danielberteaud/alma:9.24.5-1 pushed to remote repo"
else
echo "Image danielberteaud/alma:9.24.4-1 already available"
echo "Image danielberteaud/alma:9.24.5-1 already available"
fi
IMAGE_ALMA9_AVAILABLE=1
}
function build_alpine {
if [ "${IMAGE_ALPINE_AVAILABLE:-0}" = "1" ]; then
echo "Image danielberteaud/alpine:24.4-1 already available"
echo "Image danielberteaud/alpine:24.5-1 already available"
return
fi
if ! docker manifest inspect danielberteaud/alpine:24.4-1 > /dev/null 2>&1; then
echo "Building alpine:24.4-1"
if ! docker manifest inspect danielberteaud/alpine:24.5-1 > /dev/null 2>&1; then
echo "Building alpine:24.5-1"
export BUILDKIT_PROGRESS=plain
docker build -t danielberteaud/alpine:24.4-1 -t danielberteaud/alpine:latest output/images/alpine &&\
docker push danielberteaud/alpine:24.4-1 &&\
docker build -t danielberteaud/alpine:24.5-1 -t danielberteaud/alpine:latest output/images/alpine &&\
docker push danielberteaud/alpine:24.5-1 &&\
docker push danielberteaud/alpine:latest &&\
echo "danielberteaud/alpine:24.4-1 pushed to remote repo"
echo "danielberteaud/alpine:24.5-1 pushed to remote repo"
else
echo "Image danielberteaud/alpine:24.4-1 already available"
echo "Image danielberteaud/alpine:24.5-1 already available"
fi
IMAGE_ALPINE_AVAILABLE=1
}
function build_java11 {
if [ "${IMAGE_JAVA11_AVAILABLE:-0}" = "1" ]; then
echo "Image danielberteaud/java:11.24.4-1 already available"
echo "Image danielberteaud/java:11.24.5-1 already available"
return
fi
if ! docker manifest inspect danielberteaud/java:11.24.4-1 > /dev/null 2>&1; then
echo "Building java:11.24.4-1"
if ! docker manifest inspect danielberteaud/java:11.24.5-1 > /dev/null 2>&1; then
echo "Building java:11.24.5-1"
export BUILDKIT_PROGRESS=plain
docker build -t danielberteaud/java:11.24.4-1 -t danielberteaud/java11:latest -t danielberteaud/java:11 --build-arg=JAVA_VERSION=11 output/images/java &&\
docker push danielberteaud/java:11.24.4-1 &&\
docker build -t danielberteaud/java:11.24.5-1 -t danielberteaud/java11:latest -t danielberteaud/java:11 --build-arg=JAVA_VERSION=11 output/images/java &&\
docker push danielberteaud/java:11.24.5-1 &&\
docker push danielberteaud/java11:latest &&\
docker push danielberteaud/java:11 &&\
echo "danielberteaud/java:11.24.4-1 pushed to remote repo"
echo "danielberteaud/java:11.24.5-1 pushed to remote repo"
else
echo "Image danielberteaud/java:11.24.4-1 already available"
echo "Image danielberteaud/java:11.24.5-1 already available"
fi
IMAGE_JAVA11_AVAILABLE=1
}
function build_java17 {
if [ "${IMAGE_JAVA17_AVAILABLE:-0}" = "1" ]; then
echo "Image danielberteaud/java:17.24.4-1 already available"
echo "Image danielberteaud/java:17.24.5-1 already available"
return
fi
if ! docker manifest inspect danielberteaud/java:17.24.4-1 > /dev/null 2>&1; then
echo "Building java:17.24.4-1"
if ! docker manifest inspect danielberteaud/java:17.24.5-1 > /dev/null 2>&1; then
echo "Building java:17.24.5-1"
export BUILDKIT_PROGRESS=plain
docker build -t danielberteaud/java:17.24.4-1 -t danielberteaud/java17:latest -t danielberteaud/java:17 --build-arg=JAVA_VERSION=17 output/images/java &&\
docker push danielberteaud/java:17.24.4-1 &&\
docker build -t danielberteaud/java:17.24.5-1 -t danielberteaud/java17:latest -t danielberteaud/java:17 --build-arg=JAVA_VERSION=17 output/images/java &&\
docker push danielberteaud/java:17.24.5-1 &&\
docker push danielberteaud/java17:latest &&\
docker push danielberteaud/java:17 &&\
echo "danielberteaud/java:17.24.4-1 pushed to remote repo"
echo "danielberteaud/java:17.24.5-1 pushed to remote repo"
else
echo "Image danielberteaud/java:17.24.4-1 already available"
echo "Image danielberteaud/java:17.24.5-1 already available"
fi
IMAGE_JAVA17_AVAILABLE=1
}
function build_java21 {
if [ "${IMAGE_JAVA21_AVAILABLE:-0}" = "1" ]; then
echo "Image danielberteaud/java:21.24.4-1 already available"
echo "Image danielberteaud/java:21.24.5-1 already available"
return
fi
if ! docker manifest inspect danielberteaud/java:21.24.4-1 > /dev/null 2>&1; then
echo "Building java:21.24.4-1"
if ! docker manifest inspect danielberteaud/java:21.24.5-1 > /dev/null 2>&1; then
echo "Building java:21.24.5-1"
export BUILDKIT_PROGRESS=plain
docker build -t danielberteaud/java:21.24.4-1 -t danielberteaud/java21:latest -t danielberteaud/java:21 --build-arg=JAVA_VERSION=21 output/images/java &&\
docker push danielberteaud/java:21.24.4-1 &&\
docker build -t danielberteaud/java:21.24.5-1 -t danielberteaud/java21:latest -t danielberteaud/java:21 --build-arg=JAVA_VERSION=21 output/images/java &&\
docker push danielberteaud/java:21.24.5-1 &&\
docker push danielberteaud/java21:latest &&\
docker push danielberteaud/java:21 &&\
echo "danielberteaud/java:21.24.4-1 pushed to remote repo"
echo "danielberteaud/java:21.24.5-1 pushed to remote repo"
else
echo "Image danielberteaud/java:21.24.4-1 already available"
echo "Image danielberteaud/java:21.24.5-1 already available"
fi
IMAGE_JAVA21_AVAILABLE=1
}
function build_java8 {
if [ "${IMAGE_JAVA8_AVAILABLE:-0}" = "1" ]; then
echo "Image danielberteaud/java:8.24.4-1 already available"
echo "Image danielberteaud/java:8.24.5-1 already available"
return
fi
if ! docker manifest inspect danielberteaud/java:8.24.4-1 > /dev/null 2>&1; then
echo "Building java:8.24.4-1"
if ! docker manifest inspect danielberteaud/java:8.24.5-1 > /dev/null 2>&1; then
echo "Building java:8.24.5-1"
export BUILDKIT_PROGRESS=plain
docker build -t danielberteaud/java:8.24.4-1 -t danielberteaud/java8:latest -t danielberteaud/java:8 --build-arg=JAVA_VERSION=8 output/images/java &&\
docker push danielberteaud/java:8.24.4-1 &&\
docker build -t danielberteaud/java:8.24.5-1 -t danielberteaud/java8:latest -t danielberteaud/java:8 --build-arg=JAVA_VERSION=8 output/images/java &&\
docker push danielberteaud/java:8.24.5-1 &&\
docker push danielberteaud/java8:latest &&\
docker push danielberteaud/java:8 &&\
echo "danielberteaud/java:8.24.4-1 pushed to remote repo"
echo "danielberteaud/java:8.24.5-1 pushed to remote repo"
else
echo "Image danielberteaud/java:8.24.4-1 already available"
echo "Image danielberteaud/java:8.24.5-1 already available"
fi
IMAGE_JAVA8_AVAILABLE=1
}
function build_mariadb {
if [ "${IMAGE_MARIADB_AVAILABLE:-0}" = "1" ]; then
echo "Image danielberteaud/mariadb:24.4-1 already available"
echo "Image danielberteaud/mariadb:24.5-1 already available"
return
fi
# Image mariadb depends on mariadb_client
build_mariadb_client
if ! docker manifest inspect danielberteaud/mariadb:24.4-1 > /dev/null 2>&1; then
echo "Building mariadb:24.4-1"
if ! docker manifest inspect danielberteaud/mariadb:24.5-1 > /dev/null 2>&1; then
echo "Building mariadb:24.5-1"
export BUILDKIT_PROGRESS=plain
docker build -t danielberteaud/mariadb:24.4-1 -t danielberteaud/mariadb:latest output/images/mariadb &&\
docker push danielberteaud/mariadb:24.4-1 &&\
docker build -t danielberteaud/mariadb:24.5-1 -t danielberteaud/mariadb:latest output/images/mariadb &&\
docker push danielberteaud/mariadb:24.5-1 &&\
docker push danielberteaud/mariadb:latest &&\
echo "danielberteaud/mariadb:24.4-1 pushed to remote repo"
echo "danielberteaud/mariadb:24.5-1 pushed to remote repo"
else
echo "Image danielberteaud/mariadb:24.4-1 already available"
echo "Image danielberteaud/mariadb:24.5-1 already available"
fi
IMAGE_MARIADB_AVAILABLE=1
}
function build_mariadb_client {
if [ "${IMAGE_MARIADB_CLIENT_AVAILABLE:-0}" = "1" ]; then
echo "Image danielberteaud/mariadb-client:24.4-1 already available"
echo "Image danielberteaud/mariadb-client:24.5-1 already available"
return
fi
# Image mariadb_client depends on alpine
build_alpine
if ! docker manifest inspect danielberteaud/mariadb-client:24.4-1 > /dev/null 2>&1; then
echo "Building mariadb-client:24.4-1"
if ! docker manifest inspect danielberteaud/mariadb-client:24.5-1 > /dev/null 2>&1; then
echo "Building mariadb-client:24.5-1"
export BUILDKIT_PROGRESS=plain
docker build -t danielberteaud/mariadb-client:24.4-1 -t danielberteaud/mariadb-client:latest output/images/mariadb-client &&\
docker push danielberteaud/mariadb-client:24.4-1 &&\
docker build -t danielberteaud/mariadb-client:24.5-1 -t danielberteaud/mariadb-client:latest output/images/mariadb-client &&\
docker push danielberteaud/mariadb-client:24.5-1 &&\
docker push danielberteaud/mariadb-client:latest &&\
echo "danielberteaud/mariadb-client:24.4-1 pushed to remote repo"
echo "danielberteaud/mariadb-client:24.5-1 pushed to remote repo"
else
echo "Image danielberteaud/mariadb-client:24.4-1 already available"
echo "Image danielberteaud/mariadb-client:24.5-1 already available"
fi
IMAGE_MARIADB_CLIENT_AVAILABLE=1
}
function build_mongo50 {
if [ "${IMAGE_MONGO50_AVAILABLE:-0}" = "1" ]; then
echo "Image danielberteaud/mongo:5.0.24.4-1 already available"
echo "Image danielberteaud/mongo:5.0.24.5-1 already available"
return
fi
# Image mongo50 depends on alma8
build_alma8
if ! docker manifest inspect danielberteaud/mongo:5.0.24.4-1 > /dev/null 2>&1; then
echo "Building mongo:5.0.24.4-1"
if ! docker manifest inspect danielberteaud/mongo:5.0.24.5-1 > /dev/null 2>&1; then
echo "Building mongo:5.0.24.5-1"
export BUILDKIT_PROGRESS=plain
docker build -t danielberteaud/mongo:5.0.24.4-1 -t danielberteaud/mongo:5.0 --build-arg=MONGO_MAJOR=5.0 output/images/mongo &&\
docker push danielberteaud/mongo:5.0.24.4-1 &&\
docker build -t danielberteaud/mongo:5.0.24.5-1 -t danielberteaud/mongo:5.0 --build-arg=MONGO_MAJOR=5.0 output/images/mongo &&\
docker push danielberteaud/mongo:5.0.24.5-1 &&\
docker push danielberteaud/mongo:5.0 &&\
echo "danielberteaud/mongo:5.0.24.4-1 pushed to remote repo"
echo "danielberteaud/mongo:5.0.24.5-1 pushed to remote repo"
else
echo "Image danielberteaud/mongo:5.0.24.4-1 already available"
echo "Image danielberteaud/mongo:5.0.24.5-1 already available"
fi
IMAGE_MONGO50_AVAILABLE=1
}
function build_pgbouncer {
if [ "${IMAGE_PGBOUNCER_AVAILABLE:-0}" = "1" ]; then
echo "Image danielberteaud/pgbouncer:24.4-1 already available"
echo "Image danielberteaud/pgbouncer:24.5-1 already available"
return
fi
# Image pgbouncer depends on alpine
build_alpine
if ! docker manifest inspect danielberteaud/pgbouncer:24.4-1 > /dev/null 2>&1; then
echo "Building pgbouncer:24.4-1"
if ! docker manifest inspect danielberteaud/pgbouncer:24.5-1 > /dev/null 2>&1; then
echo "Building pgbouncer:24.5-1"
export BUILDKIT_PROGRESS=plain
docker build -t danielberteaud/pgbouncer:24.4-1 -t danielberteaud/pgbouncer:latest output/images/pgbouncer &&\
docker push danielberteaud/pgbouncer:24.4-1 &&\
docker build -t danielberteaud/pgbouncer:24.5-1 -t danielberteaud/pgbouncer:latest output/images/pgbouncer &&\
docker push danielberteaud/pgbouncer:24.5-1 &&\
docker push danielberteaud/pgbouncer:latest &&\
echo "danielberteaud/pgbouncer:24.4-1 pushed to remote repo"
echo "danielberteaud/pgbouncer:24.5-1 pushed to remote repo"
else
echo "Image danielberteaud/pgbouncer:24.4-1 already available"
echo "Image danielberteaud/pgbouncer:24.5-1 already available"
fi
IMAGE_PGBOUNCER_AVAILABLE=1
}
function build_php82 {
if [ "${IMAGE_PHP82_AVAILABLE:-0}" = "1" ]; then
echo "Image danielberteaud/php:82.24.4-1 already available"
echo "Image danielberteaud/php:82.24.5-1 already available"
return
fi
# Image php82 depends on alpine
build_alpine
if ! docker manifest inspect danielberteaud/php:82.24.4-1 > /dev/null 2>&1; then
echo "Building php:82.24.4-1"
if ! docker manifest inspect danielberteaud/php:82.24.5-1 > /dev/null 2>&1; then
echo "Building php:82.24.5-1"
export BUILDKIT_PROGRESS=plain
docker build -t danielberteaud/php:82.24.4-1 -t danielberteaud/php:82 -t danielberteaud/php82:latest --build-arg=PHP_VERSION=82 output/images/php &&\
docker push danielberteaud/php:82.24.4-1 &&\
docker build -t danielberteaud/php:82.24.5-1 -t danielberteaud/php:82 -t danielberteaud/php82:latest --build-arg=PHP_VERSION=82 output/images/php &&\
docker push danielberteaud/php:82.24.5-1 &&\
docker push danielberteaud/php:82 &&\
docker push danielberteaud/php82:latest &&\
echo "danielberteaud/php:82.24.4-1 pushed to remote repo"
echo "danielberteaud/php:82.24.5-1 pushed to remote repo"
else
echo "Image danielberteaud/php:82.24.4-1 already available"
echo "Image danielberteaud/php:82.24.5-1 already available"
fi
IMAGE_PHP82_AVAILABLE=1
}
function build_php83 {
if [ "${IMAGE_PHP83_AVAILABLE:-0}" = "1" ]; then
echo "Image danielberteaud/php:83.24.4-1 already available"
echo "Image danielberteaud/php:83.24.5-1 already available"
return
fi
# Image php83 depends on alpine
build_alpine
if ! docker manifest inspect danielberteaud/php:83.24.4-1 > /dev/null 2>&1; then
echo "Building php:83.24.4-1"
if ! docker manifest inspect danielberteaud/php:83.24.5-1 > /dev/null 2>&1; then
echo "Building php:83.24.5-1"
export BUILDKIT_PROGRESS=plain
docker build -t danielberteaud/php:83.24.4-1 -t danielberteaud/php:83 -t danielberteaud/php83:latest --build-arg=PHP_VERSION=83 output/images/php &&\
docker push danielberteaud/php:83.24.4-1 &&\
docker build -t danielberteaud/php:83.24.5-1 -t danielberteaud/php:83 -t danielberteaud/php83:latest --build-arg=PHP_VERSION=83 output/images/php &&\
docker push danielberteaud/php:83.24.5-1 &&\
docker push danielberteaud/php:83 &&\
docker push danielberteaud/php83:latest &&\
echo "danielberteaud/php:83.24.4-1 pushed to remote repo"
echo "danielberteaud/php:83.24.5-1 pushed to remote repo"
else
echo "Image danielberteaud/php:83.24.4-1 already available"
echo "Image danielberteaud/php:83.24.5-1 already available"
fi
IMAGE_PHP83_AVAILABLE=1
}
function build_postgres15 {
if [ "${IMAGE_POSTGRES15_AVAILABLE:-0}" = "1" ]; then
echo "Image danielberteaud/postgres:15.24.4-1 already available"
echo "Image danielberteaud/postgres:15.24.5-1 already available"
return
fi
# Image postgres15 depends on alma9
build_alma9
if ! docker manifest inspect danielberteaud/postgres:15.24.4-1 > /dev/null 2>&1; then
echo "Building postgres:15.24.4-1"
if ! docker manifest inspect danielberteaud/postgres:15.24.5-1 > /dev/null 2>&1; then
echo "Building postgres:15.24.5-1"
export BUILDKIT_PROGRESS=plain
docker build -t danielberteaud/postgres:15.24.4-1 -t danielberteaud/postgres15:latest -t danielberteaud/postgres:15 --build-arg=PG_VERSION=15 output/images/postgres &&\
docker push danielberteaud/postgres:15.24.4-1 &&\
docker build -t danielberteaud/postgres:15.24.5-1 -t danielberteaud/postgres15:latest -t danielberteaud/postgres:15 --build-arg=PG_VERSION=15 output/images/postgres &&\
docker push danielberteaud/postgres:15.24.5-1 &&\
docker push danielberteaud/postgres15:latest &&\
docker push danielberteaud/postgres:15 &&\
echo "danielberteaud/postgres:15.24.4-1 pushed to remote repo"
echo "danielberteaud/postgres:15.24.5-1 pushed to remote repo"
else
echo "Image danielberteaud/postgres:15.24.4-1 already available"
echo "Image danielberteaud/postgres:15.24.5-1 already available"
fi
IMAGE_POSTGRES15_AVAILABLE=1
}
function build_postgres16 {
if [ "${IMAGE_POSTGRES16_AVAILABLE:-0}" = "1" ]; then
echo "Image danielberteaud/postgres:16.24.4-1 already available"
echo "Image danielberteaud/postgres:16.24.5-1 already available"
return
fi
# Image postgres16 depends on alma9
build_alma9
if ! docker manifest inspect danielberteaud/postgres:16.24.4-1 > /dev/null 2>&1; then
echo "Building postgres:16.24.4-1"
if ! docker manifest inspect danielberteaud/postgres:16.24.5-1 > /dev/null 2>&1; then
echo "Building postgres:16.24.5-1"
export BUILDKIT_PROGRESS=plain
docker build -t danielberteaud/postgres:16.24.4-1 -t danielberteaud/postgres16:latest -t danielberteaud/postgres:16 --build-arg=PG_VERSION=16 output/images/postgres &&\
docker push danielberteaud/postgres:16.24.4-1 &&\
docker build -t danielberteaud/postgres:16.24.5-1 -t danielberteaud/postgres16:latest -t danielberteaud/postgres:16 --build-arg=PG_VERSION=16 output/images/postgres &&\
docker push danielberteaud/postgres:16.24.5-1 &&\
docker push danielberteaud/postgres16:latest &&\
docker push danielberteaud/postgres:16 &&\
echo "danielberteaud/postgres:16.24.4-1 pushed to remote repo"
echo "danielberteaud/postgres:16.24.5-1 pushed to remote repo"
else
echo "Image danielberteaud/postgres:16.24.4-1 already available"
echo "Image danielberteaud/postgres:16.24.5-1 already available"
fi
IMAGE_POSTGRES16_AVAILABLE=1
}
function build_sqlite {
if [ "${IMAGE_SQLITE_AVAILABLE:-0}" = "1" ]; then
echo "Image danielberteaud/sqlite:24.4-1 already available"
echo "Image danielberteaud/sqlite:24.5-1 already available"
return
fi
# Image sqlite depends on alpine
build_alpine
if ! docker manifest inspect danielberteaud/sqlite:24.4-1 > /dev/null 2>&1; then
echo "Building sqlite:24.4-1"
if ! docker manifest inspect danielberteaud/sqlite:24.5-1 > /dev/null 2>&1; then
echo "Building sqlite:24.5-1"
export BUILDKIT_PROGRESS=plain
docker build -t danielberteaud/sqlite:24.4-1 -t danielberteaud/sqlite:latest output/images/sqlite &&\
docker push danielberteaud/sqlite:24.4-1 &&\
docker build -t danielberteaud/sqlite:24.5-1 -t danielberteaud/sqlite:latest output/images/sqlite &&\
docker push danielberteaud/sqlite:24.5-1 &&\
docker push danielberteaud/sqlite:latest &&\
echo "danielberteaud/sqlite:24.4-1 pushed to remote repo"
echo "danielberteaud/sqlite:24.5-1 pushed to remote repo"
else
echo "Image danielberteaud/sqlite:24.4-1 already available"
echo "Image danielberteaud/sqlite:24.5-1 already available"
fi
IMAGE_SQLITE_AVAILABLE=1
}
function build_valkey {
if [ "${IMAGE_VALKEY_AVAILABLE:-0}" = "1" ]; then
echo "Image danielberteaud/valkey:24.4-1 already available"
echo "Image danielberteaud/valkey:24.5-1 already available"
return
fi
if ! docker manifest inspect danielberteaud/valkey:24.4-1 > /dev/null 2>&1; then
echo "Building valkey:24.4-1"
if ! docker manifest inspect danielberteaud/valkey:24.5-1 > /dev/null 2>&1; then
echo "Building valkey:24.5-1"
export BUILDKIT_PROGRESS=plain
docker build -t danielberteaud/valkey:24.4-1 -t danielberteaud/valkey:latest output/images/valkey &&\
docker push danielberteaud/valkey:24.4-1 &&\
docker build -t danielberteaud/valkey:24.5-1 -t danielberteaud/valkey:latest output/images/valkey &&\
docker push danielberteaud/valkey:24.5-1 &&\
docker push danielberteaud/valkey:latest &&\
echo "danielberteaud/valkey:24.4-1 pushed to remote repo"
echo "danielberteaud/valkey:24.5-1 pushed to remote repo"
else
echo "Image danielberteaud/valkey:24.4-1 already available"
echo "Image danielberteaud/valkey:24.5-1 already available"
fi
IMAGE_VALKEY_AVAILABLE=1
}
function build_wait_for {
if [ "${IMAGE_WAIT_FOR_AVAILABLE:-0}" = "1" ]; then
echo "Image danielberteaud/wait-for:24.4-1 already available"
echo "Image danielberteaud/wait-for:24.5-1 already available"
return
fi
if ! docker manifest inspect danielberteaud/wait-for:24.4-1 > /dev/null 2>&1; then
echo "Building wait-for:24.4-1"
if ! docker manifest inspect danielberteaud/wait-for:24.5-1 > /dev/null 2>&1; then
echo "Building wait-for:24.5-1"
export BUILDKIT_PROGRESS=plain
docker build -t danielberteaud/wait-for:24.4-1 -t danielberteaud/wait-for:latest output/images/wait-for &&\
docker push danielberteaud/wait-for:24.4-1 &&\
docker build -t danielberteaud/wait-for:24.5-1 -t danielberteaud/wait-for:latest output/images/wait-for &&\
docker push danielberteaud/wait-for:24.5-1 &&\
docker push danielberteaud/wait-for:latest &&\
echo "danielberteaud/wait-for:24.4-1 pushed to remote repo"
echo "danielberteaud/wait-for:24.5-1 pushed to remote repo"
else
echo "Image danielberteaud/wait-for:24.4-1 already available"
echo "Image danielberteaud/wait-for:24.5-1 already available"
fi
IMAGE_WAIT_FOR_AVAILABLE=1
}
function build_wkhtmltopdf {
if [ "${IMAGE_WKHTMLTOPDF_AVAILABLE:-0}" = "1" ]; then
echo "Image danielberteaud/wkhtmltopdf:24.4-1 already available"
echo "Image danielberteaud/wkhtmltopdf:24.5-1 already available"
return
fi
# Image wkhtmltopdf depends on alpine
build_alpine
if ! docker manifest inspect danielberteaud/wkhtmltopdf:24.4-1 > /dev/null 2>&1; then
echo "Building wkhtmltopdf:24.4-1"
if ! docker manifest inspect danielberteaud/wkhtmltopdf:24.5-1 > /dev/null 2>&1; then
echo "Building wkhtmltopdf:24.5-1"
export BUILDKIT_PROGRESS=plain
docker build -t danielberteaud/wkhtmltopdf:24.4-1 -t danielberteaud/wkhtmltopdf:latest output/images/wkhtmltopdf &&\
docker push danielberteaud/wkhtmltopdf:24.4-1 &&\
docker build -t danielberteaud/wkhtmltopdf:24.5-1 -t danielberteaud/wkhtmltopdf:latest output/images/wkhtmltopdf &&\
docker push danielberteaud/wkhtmltopdf:24.5-1 &&\
docker push danielberteaud/wkhtmltopdf:latest &&\
echo "danielberteaud/wkhtmltopdf:24.4-1 pushed to remote repo"
echo "danielberteaud/wkhtmltopdf:24.5-1 pushed to remote repo"
else
echo "Image danielberteaud/wkhtmltopdf:24.4-1 already available"
echo "Image danielberteaud/wkhtmltopdf:24.5-1 already available"
fi
IMAGE_WKHTMLTOPDF_AVAILABLE=1
}

38
variables.yml
View File

@ -227,13 +227,13 @@ docker:
base_images:
# wait for services to be online, allow configuring service dependencies
wait_for:
image: wait-for:24.4-1
image: wait-for:24.5-1
tags:
- wait-for:latest
# AlmaLinux 8
alma8:
image: alma:8.24.4-1
image: alma:8.24.5-1
build_args:
ALMA: 8
tags:
@ -245,7 +245,7 @@ docker:
# AlmaLinux 9
alma9:
image: alma:9.24.4-1
image: alma:9.24.5-1
build_args:
ALMA: 9
tags:
@ -256,13 +256,13 @@ docker:
# Latest alpine
alpine:
image: alpine:24.4-1
image: alpine:24.5-1
tags:
- alpine:latest
# Alpine with Java8 (temurin)
java8:
image: java:8.24.4-1
image: java:8.24.5-1
build_args:
JAVA_VERSION: 8
tags:
@ -271,7 +271,7 @@ docker:
# Alpine with Java11 (temurin)
java11:
image: java:11.24.4-1
image: java:11.24.5-1
build_args:
JAVA_VERSION: 11
tags:
@ -280,7 +280,7 @@ docker:
# Alpine with Java17 (temurin)
java17:
image: java:17.24.4-1
image: java:17.24.5-1
build_args:
JAVA_VERSION: 17
tags:
@ -289,7 +289,7 @@ docker:
# Alpine with Java21 (temurin)
java21:
image: java:21.24.4-1
image: java:21.24.5-1
build_args:
JAVA_VERSION: 21
tags:
@ -298,7 +298,7 @@ docker:
# Postgres
postgres15:
image: postgres:15.24.4-1
image: postgres:15.24.5-1
build_args:
PG_VERSION: 15
tags:
@ -308,7 +308,7 @@ docker:
- alma9
postgres16:
image: postgres:16.24.4-1
image: postgres:16.24.5-1
build_args:
PG_VERSION: 16
tags:
@ -319,7 +319,7 @@ docker:
# Mariadb client
mariadb_client:
image: mariadb-client:24.4-1
image: mariadb-client:24.5-1
tags:
- mariadb-client:latest
depends_on:
@ -327,7 +327,7 @@ docker:
# MariaDB server
mariadb:
image: mariadb:24.4-1
image: mariadb:24.5-1
tags:
- mariadb:latest
depends_on:
@ -335,7 +335,7 @@ docker:
# MongoDB
mongo50:
image: mongo:5.0.24.4-1
image: mongo:5.0.24.5-1
build_args:
MONGO_MAJOR: "5.0"
tags:
@ -345,7 +345,7 @@ docker:
# SQLite
sqlite:
image: sqlite:24.4-1
image: sqlite:24.5-1
tags:
- sqlite:latest
depends_on:
@ -353,7 +353,7 @@ docker:
# pgbouncer
pgbouncer:
image: pgbouncer:24.4-1
image: pgbouncer:24.5-1
tags:
- pgbouncer:latest
depends_on:
@ -361,7 +361,7 @@ docker:
# PHP
php82:
image: php:82.24.4-1
image: php:82.24.5-1
build_args:
PHP_VERSION: 82
tags:
@ -371,7 +371,7 @@ docker:
- alpine
php83:
image: php:83.24.4-1
image: php:83.24.5-1
build_args:
PHP_VERSION: 83
tags:
@ -382,7 +382,7 @@ docker:
# alpine based wkhtml2pdf
wkhtmltopdf:
image: wkhtmltopdf:24.4-1
image: wkhtmltopdf:24.5-1
tags:
- wkhtmltopdf:latest
depends_on:
@ -390,6 +390,6 @@ docker:
# valkey (redis fork)
valkey:
image: valkey:24.4-1
image: valkey:24.5-1
tags:
- valkey:latest