Merge 0308a36de0 into dd237ec16e

Merge pull request #430 from caspermeijn/healthcheck
Add healthcheck to image
2026-02-27 12:17:37 +01:00 · 2025-04-20 12:58:53 +02:00 · 2025-04-20 12:58:45 +02:00 · 2025-04-17 09:10:15 +02:00 · 2025-04-16 21:01:34 -04:00 · 2025-04-10 13:55:21 +02:00
3 changed files with 4 additions and 6 deletions
--- a/5
+++ b/5
@ -13,7 +13,7 @@ FROM alpine:3.18

 COPY --from=builder /go/bin/envsubst /usr/bin/envsubst

-ARG WALLABAG_VERSION=2.6.11
+ARG WALLABAG_VERSION=2.6.12

 RUN set -ex \
 && apk add --no-cache \
@ -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
--- a/root/etc/nginx/nginx.conf
+++ b/root/etc/nginx/nginx.conf
@ -36,7 +36,6 @@ http {

    server {
        listen 80;
-        listen [::0]:80;
        server_name _;
        root /var/www/wallabag/web;
Author	SHA1	Message	Date
impedator	c72489e69b	Merge `0308a36de0` into `dd237ec16e`	2025-04-20 12:58:53 +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
Yassine Guedidi	b228deb919	Merge pull request #437 from wallabag/prepare-2.6.12-release Prepare 2.6.12 release	2025-04-10 13:55:21 +02:00
Yassine Guedidi	52afa94c77	Prepare 2.6.12 release	2025-04-10 12:08:12 +02:00
impedator	0308a36de0	Update nginx.conf removed listening on IPv6	2025-03-14 11:55:13 +01: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