Merge pull request #437 from wallabag/prepare-2.6.12-release

Prepare 2.6.12 release
2026-02-23 18:27:33 +01:00 · 2025-04-10 13:55:21 +02:00 · 2025-04-10 12:08:12 +02:00 · 2025-04-08 23:09:59 +02:00 · 2025-03-30 06:38:09 +02:00 · 2025-01-23 20:11:14 +01:00
2 changed files with 5 additions and 4 deletions
--- a/4
+++ b/4
@ -13,7 +13,7 @@ FROM alpine:3.18

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

-ARG WALLABAG_VERSION=2.6.10
+ARG WALLABAG_VERSION=2.6.12

 RUN set -ex \
 && apk add --no-cache \
@ -83,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"]
--- a/README.md
+++ b/README.md
@ -109,7 +109,6 @@ $ docker exec -t NAME_OR_ID_OF_YOUR_WALLABAG_CONTAINER /var/www/wallabag/bin/con
 An example [docker-compose](https://docs.docker.com/compose/) file can be seen below:

 ```
-version: '3'
 services:
  wallabag:
    image: wallabag/wallabag
@ -132,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
Author	SHA1	Message	Date
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
Yassine Guedidi	55976e23e5	Merge pull request #436 from wallabag/prepare-2.6.11-release Prepare 2.6.11 release	2025-04-08 23:09:59 +02:00
Yassine Guedidi	3975a28546	Prepare 2.6.11 release	2025-03-30 06:38:09 +02:00
Kevin Decherf	0e58189b97	Merge pull request #431 from Luensche/patch-1 Update README.md	2025-01-23 20:11:14 +01:00
Björn Engel	2d96e30450	Update README.md Version in docker-compose.yaml is obsolete.	2025-01-07 21:40:29 +01:00