Compare commits

..

13 Commits

Author SHA1 Message Date
0e11114336 Update composer to 2.8.10
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2025-07-18 01:04:02 +02:00
6379d9b90f Update base image to Alpine 3.19
Security support on Alpine 3.18 ended on 09 May 2025.
Moving to 3.19 gives us new updates until Nov 2025 while keeping PHP 8.1

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2025-07-18 01:01:12 +02:00
e1fafcc31f Update envsubst to v1.4.3
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2025-07-17 17:21:44 +02:00
7d2f4919c6 Merge pull request #426 from boraozgen/readme-update
Update example compose file mariadb healthcheck command
2025-06-05 09:01:48 +02:00
096ea7f79c Merge pull request #443 from wallabag/release-2613
Prepare 2.6.13 release
2025-06-04 17:48:01 +02:00
2c1ec84dc7 Prepare 2.6.13 release 2025-06-04 17:37:11 +02:00
488814d187 Merge pull request #440 from wallabag/impr/nginx-dualstack
Support dualstack listen on nginx
2025-04-29 22:56:19 +02:00
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
dd237ec16e Merge pull request #430 from caspermeijn/healthcheck
Add healthcheck to image
2025-04-20 12:58:45 +02:00
84756ac1fd Merge pull request #439 from deviantintegral/add-opcache
Install the opcache extension #162
2025-04-17 09:10:15 +02:00
60ce6d2e4f Install the opcache extension #162 2025-04-16 21:01:34 -04:00
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
923dffae55 Update example compose file mariadb healthcheck command 2024-11-12 09:22:30 +01:00
3 changed files with 9 additions and 11 deletions

View File

@ -1,4 +1,4 @@
ARG COMPOSER_VERSION=2.5.8 ARG COMPOSER_VERSION=2.8.10
FROM composer:$COMPOSER_VERSION as composer FROM composer:$COMPOSER_VERSION as composer
@ -7,13 +7,13 @@ FROM golang:alpine as builder
# envsubst from gettext can not replace env vars with default values # 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 # this package is not available for ARM32 and we have to build it from source code
# flag -ldflags "-s -w" produces a smaller executable # flag -ldflags "-s -w" produces a smaller executable
RUN go install -ldflags "-s -w" -v github.com/a8m/envsubst/cmd/envsubst@v1.3.0 RUN go install -ldflags "-s -w" -v github.com/a8m/envsubst/cmd/envsubst@v1.4.3
FROM alpine:3.18 FROM alpine:3.19
COPY --from=builder /go/bin/envsubst /usr/bin/envsubst COPY --from=builder /go/bin/envsubst /usr/bin/envsubst
ARG WALLABAG_VERSION=2.6.12 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"]

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
@ -146,7 +142,7 @@ services:
volumes: volumes:
- /opt/wallabag/data:/var/lib/mysql - /opt/wallabag/data:/var/lib/mysql
healthcheck: healthcheck:
test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"] test: ["CMD", "/usr/local/bin/healthcheck.sh", "--innodb_initialized"]
interval: 20s interval: 20s
timeout: 3s timeout: 3s
redis: redis:

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;