Merge 7784559b85 into 0e58189b97

This throws errors, but they can be ignored.

.github/workflows/publish.yml

@@ -13,7 +13,7 @@ jobs:
       contents: read
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - 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@v6
+        uses: actions/checkout@v4
         with:
           fetch-depth: 2
 
       - name: Set up Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
         with:
           python-version: 3.11
 

Dockerfile

@@ -1,19 +1,19 @@
-ARG COMPOSER_VERSION=2.2
+ARG COMPOSER_VERSION=2.5.8
 
-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.4.3
+RUN go install -ldflags "-s -w" -v github.com/a8m/envsubst/cmd/envsubst@v1.3.0
 
-FROM alpine:3.22
+FROM alpine:3.18
 
 COPY --from=builder /go/bin/envsubst /usr/bin/envsubst
 
-ARG WALLABAG_VERSION=2.6.14
+ARG WALLABAG_VERSION=2.6.10
 
 RUN set -ex \
  && apk add --no-cache \
@@ -21,43 +21,42 @@ 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 \
+      php81 \
+      php81-bcmath \
+      php81-ctype \
+      php81-curl \
+      php81-dom \
+      php81-fpm \
+      php81-gd \
+      php81-gettext \
+      php81-iconv \
+      php81-json \
+      php81-mbstring \
+      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 \
       mariadb-client \
-      postgresql17-client \
+      postgresql14-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/php81 /usr/bin/php \
+ && ln -sf /usr/sbin/php-fpm81 /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
@@ -84,8 +83,6 @@ ENV PATH="${PATH}:/var/www/wallabag/bin"
 # Set console entry path
 WORKDIR /var/www/wallabag
 
-HEALTHCHECK CMD curl --fail --silent --show-error --user-agent healthcheck http://localhost/api/info || exit 1
-
 EXPOSE 80
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["wallabag"]

README.md

@@ -131,6 +131,10 @@ services:
       - "80"
     volumes:
       - /opt/wallabag/images:/var/www/wallabag/web/assets/images
+    healthcheck:
+      test: ["CMD", "wget" ,"--no-verbose", "--tries=1", "--spider", "http://localhost/api/info"]
+      interval: 1m
+      timeout: 3s
     depends_on:
       - db
       - redis
@@ -142,7 +146,7 @@ services:
     volumes:
       - /opt/wallabag/data:/var/lib/mysql
     healthcheck:
-      test: ["CMD", "/usr/local/bin/healthcheck.sh", "--innodb_initialized"]
+      test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"]
       interval: 20s
       timeout: 3s
   redis:

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/php81/conf.d/50_wallabag.ini
 
     # Wait for external database
     if [ "$SYMFONY__ENV__DATABASE_DRIVER" = "pdo_mysql" ] || [ "$SYMFONY__ENV__DATABASE_DRIVER" = "pdo_pgsql" ] ; then
@@ -74,18 +74,25 @@ provisioner() {
     # Configure Postgres database
     if [ "$SYMFONY__ENV__DATABASE_DRIVER" = "pdo_pgsql" ] && [ "$POPULATE_DATABASE" = "True" ] && [ "$POSTGRES_PASSWORD" != "" ] ; then
         export PGPASSWORD="${POSTGRES_PASSWORD}"
+        USER_EXISTS="$(psql -qAt -h "${SYMFONY__ENV__DATABASE_HOST}" -p "${SYMFONY__ENV__DATABASE_PORT}" -U "${POSTGRES_USER}" \
+            -c "SELECT 1 FROM pg_roles WHERE rolname = '${SYMFONY__ENV__DATABASE_USER}';")"
+        if [ "$USER_EXISTS" != "1" ]; then
+            psql -q -h "${SYMFONY__ENV__DATABASE_HOST}" -p "${SYMFONY__ENV__DATABASE_PORT}" -U "${POSTGRES_USER}" \
+                 -c "CREATE ROLE ${SYMFONY__ENV__DATABASE_USER} with PASSWORD '${SYMFONY__ENV__DATABASE_PASSWORD}' LOGIN;"
+        fi
         DATABASE_EXISTS="$(psql -qAt -h "${SYMFONY__ENV__DATABASE_HOST}" -p "${SYMFONY__ENV__DATABASE_PORT}" -U "${POSTGRES_USER}" \
             -c "SELECT 1 FROM pg_catalog.pg_database WHERE datname = '${SYMFONY__ENV__DATABASE_NAME}';")"
         if [ "$DATABASE_EXISTS" != "1" ]; then
             echo "Configuring the Postgres database ..."
             psql -q -h "${SYMFONY__ENV__DATABASE_HOST}" -p "${SYMFONY__ENV__DATABASE_PORT}" -U "${POSTGRES_USER}" \
                 -c "CREATE DATABASE ${SYMFONY__ENV__DATABASE_NAME};"
-            USER_EXISTS="$(psql -qAt -h "${SYMFONY__ENV__DATABASE_HOST}" -p "${SYMFONY__ENV__DATABASE_PORT}" -U "${POSTGRES_USER}" \
-                -c "SELECT 1 FROM pg_roles WHERE rolname = '${SYMFONY__ENV__DATABASE_USER}';")"
-            if [ "$USER_EXISTS" != "1" ]; then
-                psql -q -h "${SYMFONY__ENV__DATABASE_HOST}" -p "${SYMFONY__ENV__DATABASE_PORT}" -U "${POSTGRES_USER}" \
-                    -c "CREATE ROLE ${SYMFONY__ENV__DATABASE_USER} with PASSWORD '${SYMFONY__ENV__DATABASE_PASSWORD}' LOGIN;"
-            fi
+        fi
+
+        TABLES_EXIST="$(psql -qAt -h "${SYMFONY__ENV__DATABASE_HOST}" -p "${SYMFONY__ENV__DATABASE_PORT}" -U "${POSTGRES_USER}" \
+            -c "SELECT 1 FROM pg_catalog.pg_tables WHERE schemaname = 'public';")"
+        if [ "$TABLES_EXIST" == "" ]; then
+            echo "Installing Wallabag ..."
+            exec su -c "bin/console doctrine:migrations:migrate --env=prod --no-interaction" -s /bin/sh nobody
             install_wallabag
         else
             echo "WARN: Postgres database is already configured. Remove the environment variable with root password."

root/etc/nginx/nginx.conf

@@ -35,7 +35,8 @@ http {
     }
 
     server {
-        listen [::]:80 ipv6only=off;
+        listen 80;
+        listen [::0]:80;
         server_name _;
         root /var/www/wallabag/web;
 

root/etc/wallabag/parameters.template.yml

@@ -36,11 +36,11 @@ parameters:
     rss_limit: 50
 
     # RabbitMQ processing
-    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}
+    rabbitmq_host: localhost
+    rabbitmq_port: 5672
+    rabbitmq_user: guest
+    rabbitmq_password: guest
+    rabbitmq_prefetch_count: 10
 
     # Redis processing
     redis_scheme: ${SYMFONY__ENV__REDIS_SCHEME:-tcp}