Merge 923dffae55 into 488814d187

Merge pull request #440 from wallabag/impr/nginx-dualstack
Support dualstack listen on nginx
2026-02-26 19:57:54 +01:00 · 2025-04-30 13:03:53 +09:00 · 2025-04-29 22:56:19 +02:00 · 2025-04-20 17:22:46 +02:00 · 2025-04-20 12:58:45 +02:00 · 2025-04-17 09:10:15 +02:00
3 changed files with 5 additions and 7 deletions
--- a/3
+++ b/3
@ -32,6 +32,7 @@ RUN set -ex \
      php81-iconv \
      php81-json \
      php81-mbstring \
+      php81-opcache \
      php81-openssl \
      php81-pecl-amqp \
      php81-pecl-imagick \
@ -83,6 +84,8 @@ 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"]
--- a/README.md
+++ b/README.md
@ -131,10 +131,6 @@ 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
@ -146,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:
--- a/root/etc/nginx/nginx.conf
+++ b/root/etc/nginx/nginx.conf
@ -35,8 +35,7 @@ http {
    }

    server {
-        listen 80;
-        listen [::0]:80;
+        listen [::]:80 ipv6only=off;
        server_name _;
        root /var/www/wallabag/web;
Author	SHA1	Message	Date
Bora Özgen	2bc3b923a2	Merge `923dffae55` into `488814d187`	2025-04-30 13:03:53 +09:00
Kevin Decherf	488814d187	Merge pull request #440 from wallabag/impr/nginx-dualstack Support dualstack listen on nginx	2025-04-29 22:56:19 +02:00
Kevin Decherf	3808b524fc	Support dualstack listen on nginx Fixes #422 Supersedes #435 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>	2025-04-20 17:22:46 +02:00
Kevin Decherf	dd237ec16e	Merge pull request #430 from caspermeijn/healthcheck Add healthcheck to image	2025-04-20 12:58:45 +02:00
Jérémy Benoist	84756ac1fd	Merge pull request #439 from deviantintegral/add-opcache Install the opcache extension #162	2025-04-17 09:10:15 +02:00
Andrew Berry	60ce6d2e4f	Install the opcache extension #162	2025-04-16 21:01:34 -04:00
Casper Meijn	424642d3b9	Add healthcheck to image - Move the healthcheck from the docker-compose example to the actual image. That makes sure all user of the image automatically get the healthcheck. - Change to `curl --fail \|\| exit 1` as suggested in [docker documentation](https://docs.docker.com/reference/dockerfile/#healthcheck) - Add `--silent --show-error` so that docker health state contains the output of the HTTP call instead of curl progress bar - Set the user agent to make the logs more readable	2024-12-24 16:56:22 +01:00
Bora Özgen	923dffae55	Update example compose file mariadb healthcheck command	2024-11-12 09:22:30 +01:00