From 8355a02097d2048a968aff2b6e74bf320fc96be4 Mon Sep 17 00:00:00 2001
From: Kevin Decherf <kevin@kdecherf.com>
Date: Sat, 24 Oct 2026 23:41:53 +0200
Subject: [PATCH 1/2] chore: move back to alpine 3.22 and php 8.2

This change partially reverts #467 and #476 to rebuild a new image for
wallabag 2.6. This addresses the critical RCE vulnerabilities CVE-2026-109618
and CVE-2026-109619.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
---
 Dockerfile         | 64 +++++++++++++++++++++++-----------------------
 root/entrypoint.sh |  2 +-
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ff622df..916892e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ FROM golang:alpine AS builder
 # flag -ldflags "-s -w" produces a smaller executable
 RUN go install -ldflags "-s -w" -v github.com/a8m/envsubst/cmd/envsubst@v1.4.3
 
-FROM alpine:3.24
+FROM alpine:3.22
 
 COPY --from=builder /go/bin/envsubst /usr/bin/envsubst
 
@@ -21,43 +21,43 @@ RUN set -ex \
       libwebp \
       nginx \
       pcre \
-      php84 \
-      php84-bcmath \
-      php84-ctype \
-      php84-curl \
-      php84-dom \
-      php84-fpm \
-      php84-gd \
-      php84-gettext \
-      php84-iconv \
-      php84-json \
-      php84-mbstring \
-      php84-opcache \
-      php84-openssl \
-      php84-pecl-amqp \
-      php84-pecl-imagick \
-      php84-pdo_mysql \
-      php84-pdo_pgsql \
-      php84-pdo_sqlite \
-      php84-phar \
-      php84-session \
-      php84-simplexml \
-      php84-tokenizer \
-      php84-xml \
-      php84-zlib \
-      php84-sockets \
-      php84-xmlreader \
-      php84-tidy \
-      php84-intl \
-      php84-sodium \
+      php82 \
+      php82-bcmath \
+      php82-ctype \
+      php82-curl \
+      php82-dom \
+      php82-fpm \
+      php82-gd \
+      php82-gettext \
+      php82-iconv \
+      php82-json \
+      php82-mbstring \
+      php82-opcache \
+      php82-openssl \
+      php82-pecl-amqp \
+      php82-pecl-imagick \
+      php82-pdo_mysql \
+      php82-pdo_pgsql \
+      php82-pdo_sqlite \
+      php82-phar \
+      php82-session \
+      php82-simplexml \
+      php82-tokenizer \
+      php82-xml \
+      php82-zlib \
+      php82-sockets \
+      php82-xmlreader \
+      php82-tidy \
+      php82-intl \
+      php82-sodium \
       mariadb-client \
       postgresql17-client \
       rabbitmq-c \
       s6 \
       tar \
       tzdata \
- && ln -sf /usr/bin/php84 /usr/bin/php \
- && ln -sf /usr/sbin/php-fpm84 /usr/sbin/php-fpm \
+ && ln -sf /usr/bin/php82 /usr/bin/php \
+ && ln -sf /usr/sbin/php-fpm82 /usr/sbin/php-fpm \
  && rm -rf /var/cache/apk/* \
  && ln -sf /dev/stdout /var/log/nginx/access.log \
  && ln -sf /dev/stderr /var/log/nginx/error.log
diff --git a/root/entrypoint.sh b/root/entrypoint.sh
index bf44ec8..b03ad7d 100755
--- a/root/entrypoint.sh
+++ b/root/entrypoint.sh
@@ -28,7 +28,7 @@ provisioner() {
 
     # Replace environment variables
     envsubst < /etc/wallabag/parameters.template.yml > app/config/parameters.yml
-    envsubst < /etc/wallabag/php-wallabag.template.ini > /etc/php84/conf.d/50_wallabag.ini
+    envsubst < /etc/wallabag/php-wallabag.template.ini > /etc/php82/conf.d/50_wallabag.ini
 
     # Wait for external database
     if [ "$SYMFONY__ENV__DATABASE_DRIVER" = "pdo_mysql" ] || [ "$SYMFONY__ENV__DATABASE_DRIVER" = "pdo_pgsql" ] ; then

From bb290ec6f363a49e530e407f76fe64c7b8c4c454 Mon Sep 17 00:00:00 2001
From: Kevin Decherf <kevin@kdecherf.com>
Date: Sat, 24 Oct 2026 23:51:40 +0200
Subject: [PATCH 2/2] chore(tests): remove obsolete version attribute in
 docker-compose

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
---
 tests/docker-compose.default.yml    | 1 -
 tests/docker-compose.mariadb.yml    | 1 -
 tests/docker-compose.postgresql.yml | 1 -
 tests/docker-compose.sqlite.yml     | 1 -
 4 files changed, 4 deletions(-)

diff --git a/tests/docker-compose.default.yml b/tests/docker-compose.default.yml
index 158b10f..4c5a1b9 100644
--- a/tests/docker-compose.default.yml
+++ b/tests/docker-compose.default.yml
@@ -1,4 +1,3 @@
-version: '2'
 services:
   wallabag:
     build:
diff --git a/tests/docker-compose.mariadb.yml b/tests/docker-compose.mariadb.yml
index 12424a9..32ed4c0 100644
--- a/tests/docker-compose.mariadb.yml
+++ b/tests/docker-compose.mariadb.yml
@@ -1,4 +1,3 @@
-version: '2'
 services:
   wallabag:
     build:
diff --git a/tests/docker-compose.postgresql.yml b/tests/docker-compose.postgresql.yml
index 2ee5fc6..4d59a40 100644
--- a/tests/docker-compose.postgresql.yml
+++ b/tests/docker-compose.postgresql.yml
@@ -1,4 +1,3 @@
-version: '2'
 services:
   wallabag:
     build:
diff --git a/tests/docker-compose.sqlite.yml b/tests/docker-compose.sqlite.yml
index d505b89..2e0333d 100644
--- a/tests/docker-compose.sqlite.yml
+++ b/tests/docker-compose.sqlite.yml
@@ -1,4 +1,3 @@
-version: '2'
 services:
   wallabag:
     build: