public/docker-wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/docker synced 2025-12-13 17:56:31 +00:00
Code Issues Releases Wiki Activity

Compare commits

base: public:2.6.11
Branches Tags
public:master public:rewrite
public:2.6.14 public:2.6.13 public:2.6.12 public:2.6.11 public:2.6.10 public:2.6.9 public:2.6.8 public:2.6.7 public:2.6.6 public:2.6.5 public:2.6.4 public:2.6.3 public:2.6.2 public:2.6.1 public:2.5.4 public:2.5.3 public:2.5.2 public:2.5.1 public:2.5.0 public:2.5.0-rc.1 public:2.4.3 public:2.4.2 public:2.4.1 public:2.4.0 public:2.3.8 public:2.3.7 public:2.3.6 public:2.3.5 public:2.3.4 public:2.3.3 public:2.3.2 public:2.3.1 public:2.3.0 public:2.2.3 public:2.2.2 public:2.2.1 public:2.1.6 public:2.1.4 public:2.1.3 public:2.1.2 public:2.1.1 public:2.0.8 public:2.0.7 public:2.0.6 public:2.0.5 public:2.0.4 public:2.0.3 public:2.0.2 public:2.0.1
..
compare: public:2.6.13
Branches Tags
public:master public:rewrite
public:2.6.14 public:2.6.13 public:2.6.12 public:2.6.11 public:2.6.10 public:2.6.9 public:2.6.8 public:2.6.7 public:2.6.6 public:2.6.5 public:2.6.4 public:2.6.3 public:2.6.2 public:2.6.1 public:2.5.4 public:2.5.3 public:2.5.2 public:2.5.1 public:2.5.0 public:2.5.0-rc.1 public:2.4.3 public:2.4.2 public:2.4.1 public:2.4.0 public:2.3.8 public:2.3.7 public:2.3.6 public:2.3.5 public:2.3.4 public:2.3.3 public:2.3.2 public:2.3.1 public:2.3.0 public:2.2.3 public:2.2.2 public:2.2.1 public:2.1.6 public:2.1.4 public:2.1.3 public:2.1.2 public:2.1.1 public:2.0.8 public:2.0.7 public:2.0.6 public:2.0.5 public:2.0.4 public:2.0.3 public:2.0.2 public:2.0.1

10 Commits
2.6.11 ... 2.6.13

Author SHA1 Message Date
Nicolas Lœuillet
096ea7f79c Merge pull request #443 from wallabag/release-2613 
Prepare 2.6.13 release
 2025-06-04 17:48:01 +02:00
Nicolas Lœuillet
2c1ec84dc7 Prepare 2.6.13 release 2025-06-04 17:37:11 +02: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
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
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
3 changed files with 5 additions and 7 deletions
Expand all files Collapse all files

5
Dockerfile
View File

@@ -13,7 +13,7 @@ FROM alpine:3.18
COPY --from=builder /go/bin/envsubst /usr/bin/envsubst COPY --from=builder /go/bin/envsubst /usr/bin/envsubst
ARG WALLABAG_VERSION=2.6.11 ARG WALLABAG_VERSION=2.6.13
RUN set -ex \ RUN set -ex \
&& apk add --no-cache \ && apk add --no-cache \
@@ -32,6 +32,7 @@ RUN set -ex \
php81-iconv \ php81-iconv \
php81-json \ php81-json \
php81-mbstring \ php81-mbstring \
php81-opcache \
php81-openssl \ php81-openssl \
php81-pecl-amqp \ php81-pecl-amqp \
php81-pecl-imagick \ php81-pecl-imagick \
@@ -83,6 +84,8 @@ ENV PATH="${PATH}:/var/www/wallabag/bin"
# Set console entry path # Set console entry path
WORKDIR /var/www/wallabag WORKDIR /var/www/wallabag
HEALTHCHECK CMD curl --fail --silent --show-error --user-agent healthcheck http://localhost/api/info || exit 1
EXPOSE 80 EXPOSE 80
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["wallabag"] CMD ["wallabag"]

4
README.md
View File

@@ -131,10 +131,6 @@ services:
- "80" - "80"
volumes: volumes:
- /opt/wallabag/images:/var/www/wallabag/web/assets/images - /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: depends_on:
- db - db
- redis - redis

3
root/etc/nginx/nginx.conf
View File

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