Update docker containers (#955)

Author: frankdekker

.env

@@ -4,17 +4,17 @@
 #
 
 ###> docker ###
-NGINX_VERSION=1.26.1
+NGINX_VERSION=1.27.3
 NGINX_PORT=8080
 NGINX_SSL_PORT=8443
 PHP_VERSION=8.3
 PHP_MEMORY_LIMIT=256M
-MYSQL_VERSION=8.0.31
+MYSQL_VERSION=8.4.0
 MYSQL_PORT=3306
 MYSQL_DATA_DIR=./docker/db/data
 RABBITMQ_CLIENT_PORT=5672
 RABBITMQ_API_PORT=15672
-MERCURE_VERSION=v0.15.5
+MERCURE_VERSION=v0.17.1
 MERCURE_SSL_PORT=6443
 HIGHLIGHTJS_HOST=nodejs
 HIGHLIGHTJS_PORT=3000
@@ -64,7 +64,7 @@ OAUTH_AZURE_AD_CLIENT_SECRET=
 ###< thenetworg/oauth2-azure ###
 
 ###> symfony/mercure-bundle ###
-MERCURE_URL=https://mercure:${MERCURE_SSL_PORT}/.well-known/mercure
+MERCURE_URL=https://my_mercure:${MERCURE_SSL_PORT}/.well-known/mercure
 MERCURE_JWT_SECRET=
 ###< symfony/mercure-bundle ###
 

.env.test

@@ -31,7 +31,7 @@ HTTP_CLIENT_VERIFY_PEER=true
 ###< symfony/http-client ###
 
 ###> symfony/mercure-bundle ###
-MERCURE_URL=https://mercure/.well-known/mercure
+MERCURE_URL=https://my_mercure/.well-known/mercure
 MERCURE_JWT_SECRET='$ecretf0rt3st'
 ###< symfony/mercure-bundle ###
 

docker-compose.override.yml

@@ -37,8 +37,8 @@ services:
         ports:
             - ${HIGHLIGHTJS_PORT}:${HIGHLIGHTJS_PORT}
 
-    mercure:
+    my_mercure:
         volumes:
             - ./docker/ssl/development/development-self-signed.crt:/etc/ssl/certs/123view-cert.crt:ro
             - ./docker/ssl/development/development-self-signed.key:/etc/ssl/private/123view-cert.key:ro
-        command: /usr/bin/caddy run --config /etc/caddy/Caddyfile.dev
+        command: /usr/bin/caddy run --config /etc/caddy/dev.Caddyfile

docker-compose.production.yml

@@ -28,7 +28,7 @@ services:
             RABBITMQ_DISK_FREE_ABSOLUTE_LIMIT: 1GB
         restart: unless-stopped
 
-    mercure:
+    my_mercure:
         volumes:
             - ./docker/ssl/production/production.crt:/etc/ssl/certs/123view-cert.crt:ro
             - ./docker/ssl/production/production.key:/etc/ssl/private/123view-cert.key:ro

docker-compose.yml

@@ -88,16 +88,16 @@ services:
         volumes:
             - .:/app:rw
 
-    mercure:
+    my_mercure:
         container_name: ${MERCURE_CONTAINER:-mercure}
         image: dunglas/mercure:${MERCURE_VERSION}
         environment:
             GLOBAL_OPTIONS: |
                 auto_https    off
                 http_port     6080
                 https_port    6443
-            SERVER_NAME: |
-                ${APP_HOSTNAME}, mercure, localhost
+            SERVER_NAME: ${APP_HOSTNAME}, my_mercure, localhost
+            CADDY_SERVER_EXTRA_DIRECTIVES: |
                 tls /etc/ssl/certs/123view-cert.crt /etc/ssl/private/123view-cert.key
             MERCURE_PUBLISHER_JWT_KEY: ${MERCURE_JWT_SECRET}
             MERCURE_SUBSCRIBER_JWT_KEY: ${MERCURE_JWT_SECRET}

docker/nodejs/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:21
+FROM node:22
 
 WORKDIR /app
 

docker/php-fpm/Dockerfile

@@ -5,7 +5,7 @@ ARG VERSION=8.3
 ###################################################################################
 
 # Base image
-FROM php:${VERSION}-fpm-bullseye AS base
+FROM php:${VERSION}-fpm-bookworm AS base
 
 # Install packages and remove libldap due to a known vulnerability and upgrade openssl
 RUN apt-get update \
@@ -22,7 +22,7 @@ RUN apt-get update \
     librabbitmq-dev \
     libssl-dev \
     make \
-    netcat \
+    netcat-openbsd \
     openssl \
     supervisor \
     wget \
@@ -37,15 +37,15 @@ RUN pecl channel-update pecl.php.net && \
     docker-php-source delete && \
     docker-php-ext-install opcache pdo_mysql intl
 
-## install git 2.41.0
-RUN curl -sLO https://github.com/git/git/archive/refs/tags/v2.41.0.tar.gz && \
-    tar -xzf v2.41.0.tar.gz && \
-    cd git-2.41.0 && \
+## install git 2.47.1
+RUN curl -sLO https://github.com/git/git/archive/refs/tags/v2.47.1.tar.gz && \
+    tar -xzf v2.47.1.tar.gz && \
+    cd git-2.47.1 && \
     make prefix=/usr/local all && \
     make prefix=/usr/local install && \
     cd .. && \
-    rm -rf git-2.41.0 && \
-    rm v2.41.0.tar.gz
+    rm -rf git-2.47.1 && \
+    rm v2.47.1.tar.gz
 
 ## Copy php default configuration
 COPY ./docker/php-fpm/conf/default.ini /usr/local/etc/php/conf.d/default.ini