Merge branch 'main' into mysql_images

Makefile

@@ -234,9 +234,9 @@ versioned-images := 		php-8.1-fpm \
 							varnish-7-drupal \
 							varnish-7-persistent \
 							varnish-7-persistent-drupal \
-							ruby-3.0 \
 							ruby-3.1 \
 							ruby-3.2 \
+							ruby-3.3 \
 							opensearch-2 \
 							mysql-8.0 \
 							mysql-8.4
@@ -318,7 +318,7 @@ build/mariadb-10.4-drupal: build/mariadb-10.4
 build/mariadb-10.5-drupal: build/mariadb-10.5
 build/mariadb-10.6-drupal: build/mariadb-10.6
 build/mariadb-10.11-drupal: build/mariadb-10.11
-build/ruby-3.0 build/ruby-3.1 build/ruby-3.2: build/commons
+build/ruby-3.1 build/ruby-3.2 build/ruby-3.3: build/commons
 build/opensearch-2: build/commons
 build/mongo-4: build/commons 
 build/mysql-8.0 build/mysql-8.4: build/commons

helpers/TESTING_base_images_dockercompose.md

@@ -49,9 +49,9 @@ docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep
 docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep python-3-10
 docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep python-3-11
 docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep python-3-12
-docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep ruby-3-0
 docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep ruby-3-1
 docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep ruby-3-2
+docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep ruby-3-3
 
 # commons should be running Alpine Linux
 docker compose exec -T commons sh -c "cat /etc/os-release" | grep "Alpine Linux"
@@ -255,12 +255,6 @@ docker compose exec -T node-22 sh -c "node -v" | grep "v22"
 # node-22 should be serving content
 docker compose exec -T commons sh -c "curl node-22:3000/test" | grep "v22"
 
-# ruby-3-0 should have Ruby 3.0
-docker compose exec -T ruby-3-0 sh -c "ruby -v" | grep "3.0"
-
-# ruby-3-0 should be serving content
-docker compose exec -T commons sh -c "curl ruby-3-0:3000/tmp/" | grep "ruby 3.0"
-
 # ruby-3-1 should have Ruby 3.1
 docker compose exec -T ruby-3-1 sh -c "ruby -v" | grep "3.1"
 
@@ -272,6 +266,12 @@ docker compose exec -T ruby-3-2 sh -c "ruby -v" | grep "3.2"
 
 # ruby-3-2 should be serving content
 docker compose exec -T commons sh -c "curl ruby-3-2:3000/tmp/" | grep "ruby 3.2"
+
+# ruby-3-3 should have Ruby 3.3
+docker compose exec -T ruby-3-3 sh -c "ruby -v" | grep "3.3"
+
+# ruby-3-3 should be serving content
+docker compose exec -T commons sh -c "curl ruby-3-3:3000/tmp/" | grep "ruby 3.3"
 ```
 
 Destroy tests

helpers/images-docker-compose.yml

@@ -192,8 +192,8 @@ services:
         exec python -m http.server 3000
         "]
 
-  ruby-3-0:
-    image: uselagoon/ruby-3.0:latest
+  ruby-3-1:
+    image: uselagoon/ruby-3.1:latest
     ports:
       - "3000"
     << : *default-user # uses the defined user from top
@@ -202,8 +202,8 @@ services:
         exec ruby -run -e httpd / -p 3000
         "]
 
-  ruby-3-1:
-    image: uselagoon/ruby-3.1:latest
+  ruby-3-2:
+    image: uselagoon/ruby-3.2:latest
     ports:
       - "3000"
     << : *default-user # uses the defined user from top
@@ -212,8 +212,8 @@ services:
         exec ruby -run -e httpd / -p 3000
         "]
 
-  ruby-3-2:
-    image: uselagoon/ruby-3.2:latest
+  ruby-3-3:
+    image: uselagoon/ruby-3.3:latest
     ports:
       - "3000"
     << : *default-user # uses the defined user from top

images/nginx/Dockerfile

@@ -1,6 +1,6 @@
 ARG IMAGE_REPO
 FROM ${IMAGE_REPO:-lagoon}/commons as commons
-FROM openresty/openresty:1.21.4.3-3-alpine
+FROM openresty/openresty:1.25.3.1-4-alpine
 
 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors"
 LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images"

images/node/20.Dockerfile

@@ -1,6 +1,6 @@
 ARG IMAGE_REPO
 FROM ${IMAGE_REPO:-lagoon}/commons as commons
-FROM node:20.13-alpine3.19
+FROM node:20.14-alpine3.19
 
 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors"
 LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images"

images/node/22.Dockerfile

@@ -1,6 +1,6 @@
 ARG IMAGE_REPO
 FROM ${IMAGE_REPO:-lagoon}/commons as commons
-FROM node:22.2-alpine3.19
+FROM node:22.3-alpine3.19
 
 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors"
 LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images"

images/php-cli/8.1.Dockerfile

@@ -30,7 +30,7 @@ RUN apk update \
     && rm -rf /var/cache/apk/* \
     && ln -s /usr/lib/ssh/sftp-server /usr/local/bin/sftp-server
 
-RUN curl -L -o /usr/local/bin/composer https://github.com/composer/composer/releases/download/2.7.6/composer.phar \
+RUN curl -L -o /usr/local/bin/composer https://github.com/composer/composer/releases/download/2.7.7/composer.phar \
     && chmod +x /usr/local/bin/composer \
     && mkdir -p /home/.ssh \
     && fix-permissions /home/

images/php-cli/8.2.Dockerfile

@@ -30,7 +30,7 @@ RUN apk update \
     && rm -rf /var/cache/apk/* \
     && ln -s /usr/lib/ssh/sftp-server /usr/local/bin/sftp-server
 
-RUN curl -L -o /usr/local/bin/composer https://github.com/composer/composer/releases/download/2.7.6/composer.phar \
+RUN curl -L -o /usr/local/bin/composer https://github.com/composer/composer/releases/download/2.7.7/composer.phar \
     && chmod +x /usr/local/bin/composer \
     && mkdir -p /home/.ssh \
     && fix-permissions /home/

images/php-cli/8.3.Dockerfile

@@ -29,7 +29,7 @@ RUN apk add --no-cache git \
     && ln -s /usr/lib/ssh/sftp-server /usr/local/bin/sftp-server \
     && rm -rf /var/cache/apk/*
 
-RUN curl -L -o /usr/local/bin/composer https://github.com/composer/composer/releases/download/2.7.6/composer.phar \
+RUN curl -L -o /usr/local/bin/composer https://github.com/composer/composer/releases/download/2.7.7/composer.phar \
     && chmod +x /usr/local/bin/composer \
     && mkdir -p /home/.ssh \
     && fix-permissions /home/

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.28-fpm-alpine3.19
+FROM php:8.1.29-fpm-alpine3.19
 
 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors"
 LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images"
@@ -124,7 +124,7 @@ RUN apk update \
 # New Relic PHP Agent.
 # @see https://docs.newrelic.com/docs/release-notes/agent-release-notes/php-release-notes/
 # @see https://docs.newrelic.com/docs/agents/php-agent/getting-started/php-agent-compatibility-requirements
-ENV NEWRELIC_VERSION=10.20.0.10
+ENV NEWRELIC_VERSION=10.21.0.11
 RUN mkdir -p /tmp/newrelic && cd /tmp/newrelic \
     && wget https://download.newrelic.com/php_agent/archive/${NEWRELIC_VERSION}/newrelic-php5-${NEWRELIC_VERSION}-linux-musl.tar.gz \
     && gzip -dc newrelic-php5-${NEWRELIC_VERSION}-linux-musl.tar.gz | tar --strip-components=1 -xf - \
@@ -146,7 +146,7 @@ RUN mkdir -p /tmp/newrelic && cd /tmp/newrelic \
     && fix-permissions /usr/local/etc/
 
 # Add blackfire probe and agent.
-ENV BLACKFIRE_VERSION=2.28.2
+ENV BLACKFIRE_VERSION=2.28.4
 RUN version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \
     && architecture=$(case $(uname -m) in x86_64 | amd64) echo "amd64" ;; aarch64 | arm64 | armv8) echo "arm64" ;; *) echo "amd64" ;; esac) \
     && mkdir -p /blackfire \

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.19-fpm-alpine3.19
+FROM php:8.2.20-fpm-alpine3.19
 
 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors"
 LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images"
@@ -124,7 +124,7 @@ RUN apk update \
 # New Relic PHP Agent.
 # @see https://docs.newrelic.com/docs/release-notes/agent-release-notes/php-release-notes/
 # @see https://docs.newrelic.com/docs/agents/php-agent/getting-started/php-agent-compatibility-requirements
-ENV NEWRELIC_VERSION=10.20.0.10
+ENV NEWRELIC_VERSION=10.21.0.11
 RUN mkdir -p /tmp/newrelic && cd /tmp/newrelic \
     && wget https://download.newrelic.com/php_agent/archive/${NEWRELIC_VERSION}/newrelic-php5-${NEWRELIC_VERSION}-linux-musl.tar.gz \
     && gzip -dc newrelic-php5-${NEWRELIC_VERSION}-linux-musl.tar.gz | tar --strip-components=1 -xf - \
@@ -146,7 +146,7 @@ RUN mkdir -p /tmp/newrelic && cd /tmp/newrelic \
     && fix-permissions /usr/local/etc/
 
 # Add blackfire probe and agent.
-ENV BLACKFIRE_VERSION=2.28.2
+ENV BLACKFIRE_VERSION=2.28.4
 RUN version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \
     && architecture=$(case $(uname -m) in x86_64 | amd64) echo "amd64" ;; aarch64 | arm64 | armv8) echo "arm64" ;; *) echo "amd64" ;; esac) \
     && mkdir -p /blackfire \

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.7-fpm-alpine3.19
+FROM php:8.3.8-fpm-alpine3.19
 
 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors"
 LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images"
@@ -133,7 +133,7 @@ RUN apk update \
 # New Relic PHP Agent.
 # @see https://docs.newrelic.com/docs/release-notes/agent-release-notes/php-release-notes/
 # @see https://docs.newrelic.com/docs/agents/php-agent/getting-started/php-agent-compatibility-requirements
-ENV NEWRELIC_VERSION=10.20.0.10
+ENV NEWRELIC_VERSION=10.21.0.11
 RUN mkdir -p /tmp/newrelic && cd /tmp/newrelic \
     && wget https://download.newrelic.com/php_agent/archive/${NEWRELIC_VERSION}/newrelic-php5-${NEWRELIC_VERSION}-linux-musl.tar.gz \
     && gzip -dc newrelic-php5-${NEWRELIC_VERSION}-linux-musl.tar.gz | tar --strip-components=1 -xf - \
@@ -155,7 +155,7 @@ RUN mkdir -p /tmp/newrelic && cd /tmp/newrelic \
     && fix-permissions /usr/local/etc/
 
 # Add blackfire probe and agent.
-ENV BLACKFIRE_VERSION=2.28.2
+ENV BLACKFIRE_VERSION=2.28.4
 RUN version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \
     && architecture=$(case $(uname -m) in x86_64 | amd64) echo "amd64" ;; aarch64 | arm64 | armv8) echo "arm64" ;; *) echo "amd64" ;; esac) \
     && mkdir -p /blackfire \

images/redis/7.Dockerfile

@@ -1,6 +1,6 @@
 ARG IMAGE_REPO
 FROM ${IMAGE_REPO:-lagoon}/commons as commons
-FROM redis:7.2.4-alpine3.19
+FROM redis:7.2.5-alpine3.19
 
 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors"
 LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images"

images/ruby/3.1.Dockerfile

@@ -1,7 +1,7 @@
 ARG IMAGE_REPO
 FROM ${IMAGE_REPO:-lagoon}/commons as commons
 
-FROM ruby:3.1.5-alpine3.19
+FROM ruby:3.1.6-alpine3.19
 
 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors"
 LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images"

images/ruby/3.0.Dockerfile → images/ruby/3.3.Dockerfile

@@ -1,7 +1,6 @@
 ARG IMAGE_REPO
 FROM ${IMAGE_REPO:-lagoon}/commons as commons
-# Alpine 3.19 image not available for Ruby 3.0
-FROM ruby:3.0.7-alpine3.16
+FROM ruby:3.3.2-alpine3.19
 
 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors"
 LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images"

images/solr/9.Dockerfile

@@ -1,6 +1,6 @@
 ARG IMAGE_REPO
 FROM ${IMAGE_REPO:-lagoon}/commons as commons
-FROM solr:9.6.0
+FROM solr:9.6.1
 
 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors"
 LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images"