Merge pull request #1192 from uselagoon/testing/alpine321

tobybellwood · web-flow · commit ecdd7d7bc4d0 · 2025-01-13T13:06:14.000+11:00
build: update current images at alpine 3.21
diff --git a/images/commons/Dockerfile b/images/commons/Dockerfile
@@ -1,7 +1,7 @@
 FROM webdevops/go-crond:23.12.0-alpine AS go-crond
 FROM amazeeio/envplate:v1.0.3 AS envplate
 
-FROM alpine:3.20.3
+FROM alpine:3.21.2
 
 ARG LAGOON_VERSION
 ENV LAGOON_VERSION=$LAGOON_VERSION
@@ -11,7 +11,7 @@ LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images"
 LABEL org.opencontainers.image.version="${LAGOON_VERSION}"
 LABEL org.opencontainers.image.description="Base image optimised for running in Lagoon in production and locally"
 LABEL org.opencontainers.image.title="uselagoon/commons"
-LABEL org.opencontainers.image.base.name="docker.io/alpine:3.20"
+LABEL org.opencontainers.image.base.name="docker.io/alpine:3.21"
 
 ENV LAGOON=commons
 
diff --git a/images/mariadb/10.11.Dockerfile b/images/mariadb/10.11.Dockerfile
@@ -1,6 +1,6 @@
 ARG IMAGE_REPO
 FROM ${IMAGE_REPO:-lagoon}/commons AS commons
-FROM alpine:3.19.4
+FROM alpine:3.19.6
 
 ARG LAGOON_VERSION
 ENV LAGOON_VERSION=$LAGOON_VERSION
diff --git a/images/mongo/4.Dockerfile b/images/mongo/4.Dockerfile
@@ -1,6 +1,6 @@
 ARG IMAGE_REPO
 FROM ${IMAGE_REPO:-lagoon}/commons AS commons
-FROM alpine:3.20.3
+FROM alpine:3.21.2
 
 ARG LAGOON_VERSION
 ENV LAGOON_VERSION=$LAGOON_VERSION
@@ -10,7 +10,7 @@ LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images"
 LABEL org.opencontainers.image.version="${LAGOON_VERSION}"
 LABEL org.opencontainers.image.description="MongoDB 4 image optimised for running in Lagoon in production and locally"
 LABEL org.opencontainers.image.title="uselagoon/mongo-4"
-LABEL org.opencontainers.image.base.name="docker.io/alpine:3.20"
+LABEL org.opencontainers.image.base.name="docker.io/alpine:3.21"
 
 ENV LAGOON=mongo
 
diff --git a/images/node/18.Dockerfile b/images/node/18.Dockerfile
@@ -1,6 +1,6 @@
 ARG IMAGE_REPO
 FROM ${IMAGE_REPO:-lagoon}/commons AS commons
-FROM node:18.20-alpine3.20
+FROM node:18.20-alpine3.21
 
 ARG LAGOON_VERSION
 ENV LAGOON_VERSION=$LAGOON_VERSION
@@ -10,7 +10,7 @@ LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images"
 LABEL org.opencontainers.image.version="${LAGOON_VERSION}"
 LABEL org.opencontainers.image.description="Node.js 18 image optimised for running in Lagoon in production and locally"
 LABEL org.opencontainers.image.title="uselagoon/node-18"
-LABEL org.opencontainers.image.base.name="docker.io/node:18-alpine3.20"
+LABEL org.opencontainers.image.base.name="docker.io/node:18-alpine3.21"
 
 ENV LAGOON=node
 
diff --git a/images/node/20.Dockerfile b/images/node/20.Dockerfile
@@ -1,6 +1,6 @@
 ARG IMAGE_REPO
 FROM ${IMAGE_REPO:-lagoon}/commons AS commons
-FROM node:20.18-alpine3.20
+FROM node:20.18-alpine3.21
 
 ARG LAGOON_VERSION
 ENV LAGOON_VERSION=$LAGOON_VERSION
@@ -10,7 +10,7 @@ LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images"
 LABEL org.opencontainers.image.version="${LAGOON_VERSION}"
 LABEL org.opencontainers.image.description="Node.js 20 image optimised for running in Lagoon in production and locally"
 LABEL org.opencontainers.image.title="uselagoon/node-20"
-LABEL org.opencontainers.image.base.name="docker.io/node:20-alpine3.20"
+LABEL org.opencontainers.image.base.name="docker.io/node:20-alpine3.21"
 
 ENV LAGOON=node
 
diff --git a/images/node/22.Dockerfile b/images/node/22.Dockerfile
@@ -1,6 +1,6 @@
 ARG IMAGE_REPO
 FROM ${IMAGE_REPO:-lagoon}/commons AS commons
-FROM node:22.12-alpine3.20
+FROM node:22.13-alpine3.21
 
 ARG LAGOON_VERSION
 ENV LAGOON_VERSION=$LAGOON_VERSION
@@ -10,7 +10,7 @@ LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images"
 LABEL org.opencontainers.image.version="${LAGOON_VERSION}"
 LABEL org.opencontainers.image.description="Node.js 22 image optimised for running in Lagoon in production and locally"
 LABEL org.opencontainers.image.title="uselagoon/node-22"
-LABEL org.opencontainers.image.base.name="docker.io/node:22-alpine3.20"
+LABEL org.opencontainers.image.base.name="docker.io/node:22-alpine3.21"
 
 ENV LAGOON=node
 
diff --git a/images/php-cli/8.1.Dockerfile b/images/php-cli/8.1.Dockerfile
@@ -22,7 +22,7 @@ RUN apk add -U --repository http://dl-cdn.alpinelinux.org/alpine/v3.19/main mari
         git \
         gzip  \
         mongodb-tools \
-        nodejs=~20 \
+        nodejs=~22 \
         npm \
         openssh-client \
         openssh-sftp-server \
diff --git a/images/php-cli/8.2.Dockerfile b/images/php-cli/8.2.Dockerfile
@@ -22,7 +22,7 @@ RUN apk add -U --repository http://dl-cdn.alpinelinux.org/alpine/v3.19/main mari
         git \
         gzip  \
         mongodb-tools \
-        nodejs=~20 \
+        nodejs=~22 \
         npm \
         openssh-client \
         openssh-sftp-server \
diff --git a/images/php-cli/8.3.Dockerfile b/images/php-cli/8.3.Dockerfile
@@ -22,7 +22,7 @@ RUN apk add -U --repository http://dl-cdn.alpinelinux.org/alpine/v3.19/main mari
         git \
         gzip  \
         mongodb-tools \
-        nodejs=~20 \
+        nodejs=~22 \
         npm \
         openssh-client \
         openssh-sftp-server \
diff --git a/images/php-cli/8.4.Dockerfile b/images/php-cli/8.4.Dockerfile
@@ -22,7 +22,7 @@ RUN apk add -U --repository http://dl-cdn.alpinelinux.org/alpine/v3.19/main mari
         git \
         gzip  \
         mongodb-tools \
-        nodejs=~20 \
+        nodejs=~22 \
         npm \
         openssh-client \
         openssh-sftp-server \
diff --git a/images/php-fpm/8.1.Dockerfile b/images/php-fpm/8.1.Dockerfile
@@ -5,7 +5,7 @@ FROM composer:latest AS healthcheckbuilder
 
 RUN composer create-project --no-dev amazeeio/healthz-php /healthz-php v0.0.6
 
-FROM php:8.1.31-fpm-alpine3.20
+FROM php:8.1.31-fpm-alpine3.21
 
 ARG LAGOON_VERSION
 ENV LAGOON_VERSION=$LAGOON_VERSION
@@ -15,7 +15,7 @@ LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images"
 LABEL org.opencontainers.image.version="${LAGOON_VERSION}"
 LABEL org.opencontainers.image.description="PHP 8.1 FPM image optimised for running in Lagoon in production and locally"
 LABEL org.opencontainers.image.title="uselagoon/php-8.1-fpm"
-LABEL org.opencontainers.image.base.name="docker.io/php:8.1-fpm-alpine3.20"
+LABEL org.opencontainers.image.base.name="docker.io/php:8.1-fpm-alpine3.21"
 
 ENV LAGOON=php
 
diff --git a/images/php-fpm/8.2.Dockerfile b/images/php-fpm/8.2.Dockerfile
@@ -5,7 +5,7 @@ FROM composer:latest AS healthcheckbuilder
 
 RUN composer create-project --no-dev amazeeio/healthz-php /healthz-php v0.0.6
 
-FROM php:8.2.27-fpm-alpine3.20
+FROM php:8.2.27-fpm-alpine3.21
 
 ARG LAGOON_VERSION
 ENV LAGOON_VERSION=$LAGOON_VERSION
@@ -15,7 +15,7 @@ LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images"
 LABEL org.opencontainers.image.version="${LAGOON_VERSION}"
 LABEL org.opencontainers.image.description="PHP 8.2 FPM image optimised for running in Lagoon in production and locally"
 LABEL org.opencontainers.image.title="uselagoon/php-8.2-fpm"
-LABEL org.opencontainers.image.base.name="docker.io/php:8.2-fpm-alpine3.20"
+LABEL org.opencontainers.image.base.name="docker.io/php:8.2-fpm-alpine3.21"
 
 ENV LAGOON=php
 
diff --git a/images/php-fpm/8.3.Dockerfile b/images/php-fpm/8.3.Dockerfile
@@ -5,7 +5,7 @@ FROM composer:latest AS healthcheckbuilder
 
 RUN composer create-project --no-dev amazeeio/healthz-php /healthz-php v0.0.6
 
-FROM php:8.3.15-fpm-alpine3.20
+FROM php:8.3.15-fpm-alpine3.21
 
 ARG LAGOON_VERSION
 ENV LAGOON_VERSION=$LAGOON_VERSION
@@ -15,7 +15,7 @@ LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images"
 LABEL org.opencontainers.image.version="${LAGOON_VERSION}"
 LABEL org.opencontainers.image.description="PHP 8.3 FPM image optimised for running in Lagoon in production and locally"
 LABEL org.opencontainers.image.title="uselagoon/php-8.3-fpm"
-LABEL org.opencontainers.image.base.name="docker.io/php:8.3-fpm-alpine3.20"
+LABEL org.opencontainers.image.base.name="docker.io/php:8.3-fpm-alpine3.21"
 
 ENV LAGOON=php
 
diff --git a/images/php-fpm/8.4.Dockerfile b/images/php-fpm/8.4.Dockerfile
@@ -5,7 +5,7 @@ FROM composer:latest AS healthcheckbuilder
 
 RUN composer create-project --no-dev amazeeio/healthz-php /healthz-php v0.0.6
 
-FROM php:8.4.2-fpm-alpine3.20
+FROM php:8.4.2-fpm-alpine3.21
 
 ARG LAGOON_VERSION
 ENV LAGOON_VERSION=$LAGOON_VERSION
@@ -15,7 +15,7 @@ LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images"
 LABEL org.opencontainers.image.version="${LAGOON_VERSION}"
 LABEL org.opencontainers.image.description="PHP 8.4 FPM image optimised for running in Lagoon in production and locally"
 LABEL org.opencontainers.image.title="uselagoon/php-8.4-fpm"
-LABEL org.opencontainers.image.base.name="docker.io/php:8.4-fpm-alpine3.20"
+LABEL org.opencontainers.image.base.name="docker.io/php:8.4-fpm-alpine3.21"
 
 ENV LAGOON=php
 
diff --git a/images/postgres/12.Dockerfile b/images/postgres/12.Dockerfile
@@ -1,6 +1,6 @@
 ARG IMAGE_REPO
 FROM ${IMAGE_REPO:-lagoon}/commons AS commons
-FROM postgres:12.22-alpine3.20
+FROM postgres:12.22-alpine3.21
 
 ARG LAGOON_VERSION
 ENV LAGOON_VERSION=$LAGOON_VERSION
@@ -10,7 +10,7 @@ LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images"
 LABEL org.opencontainers.image.version="${LAGOON_VERSION}"
 LABEL org.opencontainers.image.description="PostgreSQL 12 image optimised for running in Lagoon in production and locally"
 LABEL org.opencontainers.image.title="uselagoon/postgres-12"
-LABEL org.opencontainers.image.base.name="docker.io/postgres:12-alpine3.20"
+LABEL org.opencontainers.image.base.name="docker.io/postgres:12-alpine3.21"
 
 ENV LAGOON=postgres
 
diff --git a/images/postgres/13.Dockerfile b/images/postgres/13.Dockerfile
@@ -1,6 +1,6 @@
 ARG IMAGE_REPO
 FROM ${IMAGE_REPO:-lagoon}/commons AS commons
-FROM postgres:13.18-alpine3.20
+FROM postgres:13.18-alpine3.21
 
 ARG LAGOON_VERSION
 ENV LAGOON_VERSION=$LAGOON_VERSION
@@ -10,7 +10,7 @@ LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images"
 LABEL org.opencontainers.image.version="${LAGOON_VERSION}"
 LABEL org.opencontainers.image.description="PostgreSQL 13 image optimised for running in Lagoon in production and locally"
 LABEL org.opencontainers.image.title="uselagoon/postgres-13"
-LABEL org.opencontainers.image.base.name="docker.io/postgres:13-alpine3.20"
+LABEL org.opencontainers.image.base.name="docker.io/postgres:13-alpine3.21"
 
 ENV LAGOON=postgres
 
diff --git a/images/postgres/14.Dockerfile b/images/postgres/14.Dockerfile
@@ -1,6 +1,6 @@
 ARG IMAGE_REPO
 FROM ${IMAGE_REPO:-lagoon}/commons AS commons
-FROM postgres:14.15-alpine3.20
+FROM postgres:14.15-alpine3.21
 
 ARG LAGOON_VERSION
 ENV LAGOON_VERSION=$LAGOON_VERSION
@@ -10,7 +10,7 @@ LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images"
 LABEL org.opencontainers.image.version="${LAGOON_VERSION}"
 LABEL org.opencontainers.image.description="PostgreSQL 14 image optimised for running in Lagoon in production and locally"
 LABEL org.opencontainers.image.title="uselagoon/postgres-14"
-LABEL org.opencontainers.image.base.name="docker.io/postgres:14-alpine3.20"
+LABEL org.opencontainers.image.base.name="docker.io/postgres:14-alpine3.21"
 
 ENV LAGOON=postgres
 
diff --git a/images/postgres/15.Dockerfile b/images/postgres/15.Dockerfile
@@ -1,6 +1,6 @@
 ARG IMAGE_REPO
 FROM ${IMAGE_REPO:-lagoon}/commons AS commons
-FROM postgres:15.10-alpine3.20
+FROM postgres:15.10-alpine3.21
 
 ARG LAGOON_VERSION
 ENV LAGOON_VERSION=$LAGOON_VERSION
@@ -10,7 +10,7 @@ LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images"
 LABEL org.opencontainers.image.version="${LAGOON_VERSION}"
 LABEL org.opencontainers.image.description="PostgreSQL 15 image optimised for running in Lagoon in production and locally"
 LABEL org.opencontainers.image.title="uselagoon/postgres-15"
-LABEL org.opencontainers.image.base.name="docker.io/postgres:15-alpine3.20"
+LABEL org.opencontainers.image.base.name="docker.io/postgres:15-alpine3.21"
 
 ENV LAGOON=postgres
 
diff --git a/images/postgres/16.Dockerfile b/images/postgres/16.Dockerfile
@@ -1,6 +1,6 @@
 ARG IMAGE_REPO
 FROM ${IMAGE_REPO:-lagoon}/commons AS commons
-FROM postgres:16.6-alpine3.20
+FROM postgres:16.6-alpine3.21
 
 ARG LAGOON_VERSION
 ENV LAGOON_VERSION=$LAGOON_VERSION
@@ -10,7 +10,7 @@ LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images"
 LABEL org.opencontainers.image.version="${LAGOON_VERSION}"
 LABEL org.opencontainers.image.description="PostgreSQL 16 image optimised for running in Lagoon in production and locally"
 LABEL org.opencontainers.image.title="uselagoon/postgres-16"
-LABEL org.opencontainers.image.base.name="docker.io/postgres:16-alpine3.20"
+LABEL org.opencontainers.image.base.name="docker.io/postgres:16-alpine3.21"
 
 ENV LAGOON=postgres
 
diff --git a/images/postgres/17.Dockerfile b/images/postgres/17.Dockerfile
@@ -1,6 +1,6 @@
 ARG IMAGE_REPO
 FROM ${IMAGE_REPO:-lagoon}/commons AS commons
-FROM postgres:17.2-alpine3.20
+FROM postgres:17.2-alpine3.21
 
 ARG LAGOON_VERSION
 ENV LAGOON_VERSION=$LAGOON_VERSION
@@ -10,7 +10,7 @@ LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images"
 LABEL org.opencontainers.image.version="${LAGOON_VERSION}"
 LABEL org.opencontainers.image.description="PostgreSQL 17 image optimised for running in Lagoon in production and locally"
 LABEL org.opencontainers.image.title="uselagoon/postgres-17"
-LABEL org.opencontainers.image.base.name="docker.io/postgres:17-alpine3.20"
+LABEL org.opencontainers.image.base.name="docker.io/postgres:17-alpine3.21"
 
 ENV LAGOON=postgres
 
diff --git a/images/python/3.10.Dockerfile b/images/python/3.10.Dockerfile
@@ -1,7 +1,7 @@
 ARG IMAGE_REPO
 FROM ${IMAGE_REPO:-lagoon}/commons AS commons
 
-FROM python:3.10.16-alpine3.20
+FROM python:3.10.16-alpine3.21
 
 ARG LAGOON_VERSION
 ENV LAGOON_VERSION=$LAGOON_VERSION
@@ -11,7 +11,7 @@ LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images"
 LABEL org.opencontainers.image.version="${LAGOON_VERSION}"
 LABEL org.opencontainers.image.description="Python 3.10 image optimised for running in Lagoon in production and locally"
 LABEL org.opencontainers.image.title="uselagoon/python-3.10"
-LABEL org.opencontainers.image.base.name="docker.io/python:3.10-alpine3.20"
+LABEL org.opencontainers.image.base.name="docker.io/python:3.10-alpine3.21"
 
 ENV LAGOON=python
 
diff --git a/images/python/3.11.Dockerfile b/images/python/3.11.Dockerfile
@@ -1,7 +1,7 @@
 ARG IMAGE_REPO
 FROM ${IMAGE_REPO:-lagoon}/commons AS commons
 
-FROM python:3.11.11-alpine3.20
+FROM python:3.11.11-alpine3.21
 
 ARG LAGOON_VERSION
 ENV LAGOON_VERSION=$LAGOON_VERSION
@@ -11,7 +11,7 @@ LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images"
 LABEL org.opencontainers.image.version="${LAGOON_VERSION}"
 LABEL org.opencontainers.image.description="Python 3.11 image optimised for running in Lagoon in production and locally"
 LABEL org.opencontainers.image.title="uselagoon/python-3.11"
-LABEL org.opencontainers.image.base.name="docker.io/python:3.11-alpine3.20"
+LABEL org.opencontainers.image.base.name="docker.io/python:3.11-alpine3.21"
 
 ENV LAGOON=python
 
diff --git a/images/python/3.12.Dockerfile b/images/python/3.12.Dockerfile
@@ -1,7 +1,7 @@
 ARG IMAGE_REPO
 FROM ${IMAGE_REPO:-lagoon}/commons AS commons
 
-FROM python:3.12.8-alpine3.20
+FROM python:3.12.8-alpine3.21
 
 ARG LAGOON_VERSION
 ENV LAGOON_VERSION=$LAGOON_VERSION
@@ -11,7 +11,7 @@ LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images"
 LABEL org.opencontainers.image.version="${LAGOON_VERSION}"
 LABEL org.opencontainers.image.description="Python 3.12 image optimised for running in Lagoon in production and locally"
 LABEL org.opencontainers.image.title="uselagoon/python-3.12"
-LABEL org.opencontainers.image.base.name="docker.io/python:3.12-alpine3.20"
+LABEL org.opencontainers.image.base.name="docker.io/python:3.12-alpine3.21"
 
 ENV LAGOON=python
 
diff --git a/images/python/3.13.Dockerfile b/images/python/3.13.Dockerfile
@@ -1,7 +1,7 @@
 ARG IMAGE_REPO
 FROM ${IMAGE_REPO:-lagoon}/commons AS commons
 
-FROM python:3.13.1-alpine3.20
+FROM python:3.13.1-alpine3.21
 
 ARG LAGOON_VERSION
 ENV LAGOON_VERSION=$LAGOON_VERSION
@@ -11,7 +11,7 @@ LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images"
 LABEL org.opencontainers.image.version="${LAGOON_VERSION}"
 LABEL org.opencontainers.image.description="Python 3.13 image optimised for running in Lagoon in production and locally"
 LABEL org.opencontainers.image.title="uselagoon/python-3.13"
-LABEL org.opencontainers.image.base.name="docker.io/python:3.13-alpine3.20"
+LABEL org.opencontainers.image.base.name="docker.io/python:3.13-alpine3.21"
 
 ENV LAGOON=python
 
diff --git a/images/python/3.9.Dockerfile b/images/python/3.9.Dockerfile
@@ -1,7 +1,7 @@
 ARG IMAGE_REPO
 FROM ${IMAGE_REPO:-lagoon}/commons AS commons
 
-FROM python:3.9.21-alpine3.20
+FROM python:3.9.21-alpine3.21
 
 ARG LAGOON_VERSION
 ENV LAGOON_VERSION=$LAGOON_VERSION
@@ -11,7 +11,7 @@ LABEL org.opencontainers.image.url="https://github.com/uselagoon/lagoon-images"
 LABEL org.opencontainers.image.version="${LAGOON_VERSION}"
 LABEL org.opencontainers.image.description="Python 3.9 image optimised for running in Lagoon in production and locally"
 LABEL org.opencontainers.image.title="uselagoon/python-3.9"
-LABEL org.opencontainers.image.base.name="docker.io/python:3.9-alpine3.20"
+LABEL org.opencontainers.image.base.name="docker.io/python:3.9-alpine3.21"
 
 ENV LAGOON=python
 
diff --git a/images/redis/6.Dockerfile b/images/redis/6.Dockerfile
diff --git a/images/redis/7.Dockerfile b/images/redis/7.Dockerfile
diff --git a/images/ruby/3.1.Dockerfile b/images/ruby/3.1.Dockerfile
diff --git a/images/ruby/3.2.Dockerfile b/images/ruby/3.2.Dockerfile
diff --git a/images/ruby/3.3.Dockerfile b/images/ruby/3.3.Dockerfile
diff --git a/images/valkey/8.Dockerfile b/images/valkey/8.Dockerfile
