Merge branch 'wallabag:master' into docker-secrets

Author: abelfodil

.github/workflows/publish.yml

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

.github/workflows/test.yml

@@ -25,12 +25,12 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         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,4 +1,4 @@
-ARG COMPOSER_VERSION=2.5.8
+ARG COMPOSER_VERSION=2.8.10
 
 FROM composer:$COMPOSER_VERSION as composer
 
@@ -7,13 +7,13 @@ 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.19
 
 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 \

README.md

@@ -144,7 +144,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

@@ -4,12 +4,12 @@ set -e
 
 FILE_ENV_VARS="$(env | grep '__FILE=')"
 for env_var in $FILE_ENV_VARS; do
-    var_name="$(echo $env_var | grep -o '.*__FILE=' | sed 's/__FILE=//g')"
-    file_path="$(echo $env_var | grep -o '__FILE=.*' | sed 's/__FILE=//g')"
-    file_content="$(cat $file_path)"
-    [[ ! $? -eq 0 ]] && exit 1 # Exit if last command failed
-    new_var="$(echo $var_name=$file_content)"
-    export $(echo $new_var | xargs)
+    var_name="$(echo "$env_var" | grep -o '.*__FILE=' | sed 's/__FILE=//g')"
+    file_path="$(echo "$env_var" | grep -o '__FILE=.*' | sed 's/__FILE=//g')"
+    file_content="$(cat "$file_path")"
+    [ ! $? -eq 0 ] && exit 1 # Exit if last command failed
+    new_var="$(echo "$var_name=$file_content")"
+    export $(echo "$new_var" | xargs)
 done
 
 COMMAND_ARG1="$1"

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}