Merge pull request #467 from paper42/upgrades-2025

* use LTS version of composer
* use a maintained version of alpine
* upgrade php to 8.4 (because 8.1 was dropped from alpine and it's
  almost EOL)

.github/workflows/publish.yml

@@ -13,7 +13,7 @@ jobs:
       contents: read
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Log in to Docker Hub
         uses: docker/login-action@v3

.github/workflows/test.yml

@@ -24,12 +24,12 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 2
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: 3.11
 

Dockerfile

@@ -1,19 +1,19 @@
-ARG COMPOSER_VERSION=2.5.8
+ARG COMPOSER_VERSION=2.2
 
-FROM composer:$COMPOSER_VERSION as composer
+FROM composer:$COMPOSER_VERSION AS composer
 
-FROM golang:alpine as builder
+FROM golang:alpine AS builder
 
 # envsubst from gettext can not replace env vars with default values
 # this package is not available for ARM32 and we have to build it from source code
 # flag -ldflags "-s -w" produces a smaller executable
-RUN go install -ldflags "-s -w" -v github.com/a8m/envsubst/cmd/envsubst@v1.3.0
+RUN go install -ldflags "-s -w" -v github.com/a8m/envsubst/cmd/envsubst@v1.4.3
 
-FROM alpine:3.18
+FROM alpine:3.22
 
 COPY --from=builder /go/bin/envsubst /usr/bin/envsubst
 
-ARG WALLABAG_VERSION=2.6.12
+ARG WALLABAG_VERSION=2.6.14
 
 RUN set -ex \
  && apk add --no-cache \
@@ -21,43 +21,43 @@ RUN set -ex \
       libwebp \
       nginx \
       pcre \
-      php81 \
-      php81-bcmath \
-      php81-ctype \
-      php81-curl \
-      php81-dom \
-      php81-fpm \
-      php81-gd \
-      php81-gettext \
-      php81-iconv \
-      php81-json \
-      php81-mbstring \
-      php81-opcache \
-      php81-openssl \
-      php81-pecl-amqp \
-      php81-pecl-imagick \
-      php81-pdo_mysql \
-      php81-pdo_pgsql \
-      php81-pdo_sqlite \
-      php81-phar \
-      php81-session \
-      php81-simplexml \
-      php81-tokenizer \
-      php81-xml \
-      php81-zlib \
-      php81-sockets \
-      php81-xmlreader \
-      php81-tidy \
-      php81-intl \
-      php81-sodium \
+      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 \
       mariadb-client \
-      postgresql14-client \
+      postgresql17-client \
       rabbitmq-c \
       s6 \
       tar \
       tzdata \
- && ln -sf /usr/bin/php81 /usr/bin/php \
- && ln -sf /usr/sbin/php-fpm81 /usr/sbin/php-fpm \
+ && ln -sf /usr/bin/php84 /usr/bin/php \
+ && ln -sf /usr/sbin/php-fpm84 /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

README.md

@@ -42,7 +42,6 @@ Default login is `wallabag:wallabag`.
 - `-e POPULATE_DATABASE=...`(defaults to "True". Does the DB has to be populated or is it an existing one)
 - `-e SYMFONY__ENV__SERVER_NAME=...` (defaults to "Your wallabag instance". Specifies a user-friendly name for the 2FA issuer)
 - `-e PHP_MEMORY_LIMIT=...` (allows you to change the PHP `memory_limit` value. defaults to 128M, and should be a number and unit, eg. 512K, 128M, 2G, or a number of bytes)
-- `-e FASTCGI_READ_TIMEOUT=...` (allows you to change the timeout how nginx handle cgi backend connection to PHP. default is 300s for 5 minutes)
 
 ## SQLite
 
@@ -143,7 +142,7 @@ services:
     volumes:
       - /opt/wallabag/data:/var/lib/mysql
     healthcheck:
-      test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"]
+      test: ["CMD", "/usr/local/bin/healthcheck.sh", "--innodb_initialized"]
       interval: 20s
       timeout: 3s
   redis:

root/entrypoint.sh

@@ -28,8 +28,7 @@ provisioner() {
 
     # Replace environment variables
     envsubst < /etc/wallabag/parameters.template.yml > app/config/parameters.yml
-    envsubst < /etc/wallabag/php-wallabag.template.ini > /etc/php81/conf.d/50_wallabag.ini
-    envsubst '${FASTCGI_READ_TIMEOUT}' < /etc/wallabag/nginx.template.conf | sed 's/\$\${/\${/g' > /etc/nginx/nginx.conf 
+    envsubst < /etc/wallabag/php-wallabag.template.ini > /etc/php84/conf.d/50_wallabag.ini
 
     # Wait for external database
     if [ "$SYMFONY__ENV__DATABASE_DRIVER" = "pdo_mysql" ] || [ "$SYMFONY__ENV__DATABASE_DRIVER" = "pdo_pgsql" ] ; then

root/etc/wallabag/nginx.template.conf

@@ -1,73 +0,0 @@
-user  nginx;
-worker_processes  1;
-pid        /var/run/nginx.pid;
-
-events {
-    worker_connections  2048;
-    multi_accept on;
-    use epoll;
-}
-
-http {
-
-    server_tokens off;
-    sendfile on;
-    tcp_nopush on;
-    tcp_nodelay on;
-    keepalive_timeout 15;
-    types_hash_max_size 2048;
-    include /etc/nginx/mime.types;
-    default_type application/octet-stream;
-    access_log off;
-    error_log off;
-    gzip on;
-    gzip_disable "msie6";
-    open_file_cache max=100;
-    client_max_body_size 100M;
-
-    map $$http_x_forwarded_proto $$fe_https {
-        default $$https;
-        https on;
-    }
-
-    upstream php-upstream {
-        server 127.0.0.1:9000;
-    }
-
-    server {
-        listen [::]:80 ipv6only=off;
-        server_name _;
-        root /var/www/wallabag/web;
-
-        location / {
-            # try to serve file directly, fallback to app.php
-            try_files $$uri /app.php$$is_args$$args;
-        }
-
-        location ~ ^/app\.php(/|$$) {
-            fastcgi_pass php-upstream;
-            fastcgi_split_path_info ^(.+\.php)(/.*)$$;
-            include fastcgi_params;
-            # When you are using symlinks to link the document root to the
-            # current version of your application, you should pass the real
-            # application path instead of the path to the symlink to PHP
-            # FPM.
-            # Otherwise, PHP's OPcache may not properly detect changes to
-            # your PHP files (see https://github.com/zendtech/ZendOptimizerPlus/issues/126
-            # for more information).
-            fastcgi_param  SCRIPT_FILENAME  $$realpath_root$$fastcgi_script_name;
-            fastcgi_param DOCUMENT_ROOT $$realpath_root;
-            fastcgi_read_timeout ${FASTCGI_READ_TIMEOUT:-300s};
-            # Prevents URIs that include the front controller. This will 404:
-            # http://domain.tld/app.php/some-path
-            # Remove the internal directive to allow URIs like this
-            internal;
-        }
-
-        access_log /var/log/nginx/access.log;
-        error_log /var/log/nginx/error.log;
-    }
-
-}
-
-daemon off;

root/etc/wallabag/parameters.template.yml

@@ -36,11 +36,11 @@ parameters:
     rss_limit: 50
 
     # RabbitMQ processing
-    rabbitmq_host: localhost
-    rabbitmq_port: 5672
-    rabbitmq_user: guest
-    rabbitmq_password: guest
-    rabbitmq_prefetch_count: 10
+    rabbitmq_host: ${SYMFONY__ENV__RABBITMQ_HOST:-localhost}
+    rabbitmq_port: ${SYMFONY__ENV__RABBITMQ_PORT:-5672}
+    rabbitmq_user: ${SYMFONY__ENV__RABBITMQ_USER:-guest}
+    rabbitmq_password: ${SYMFONY__ENV__RABBITMQ_PASSWORD:-guest}
+    rabbitmq_prefetch_count: ${SYMFONY__ENV__RABBITMQ_PREFETCH_COUNT:-10}
 
     # Redis processing
     redis_scheme: ${SYMFONY__ENV__REDIS_SCHEME:-tcp}