public/docker-wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/docker synced 2025-12-13 01:36:28 +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.14
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

24 Commits
2.6.11 ... 2.6.14

Author SHA1 Message Date
Jérémy Benoist
480d3833bc Merge pull request #464 from wallabag/release/2.6.14 
Prepare 2.6.14
 2025-10-07 10:16:19 +02:00
Jérémy Benoist
42981284a6 Prepare 2.6.14 2025-10-07 09:50:42 +02:00
Jérémy Benoist
91a399d3bb Merge pull request #461 from wallabag/dependabot/github_actions/actions/setup-python-6 2025-09-08 07:04:05 +02:00
dependabot[bot]
ccb4b25562 Bump actions/setup-python from 5 to 6 
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 5 to 6.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v5...v6)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-09-08 02:16:41 +00:00
Jérémy Benoist
c8b95ac15b Merge pull request #459 from kentahikaru/wallabag-and-rabbitmq-in-docker 
rabbitmq support in docker
 2025-08-25 08:25:05 +02:00
kentahikaru
25a2e3de71 modified parameters template so it supports rabbitmq configuration from environment variables 2025-08-23 15:54:51 +02:00
Kevin Decherf
b522c24645 Merge pull request #458 from wallabag/dependabot/github_actions/actions/checkout-5 
Bump actions/checkout from 4 to 5
 2025-08-18 10:00:04 +02:00
dependabot[bot]
2ed6cbca1c Bump actions/checkout from 4 to 5 
Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-08-18 04:35:45 +00:00
Kevin Decherf
9dd6c5b52b Merge pull request #452 from wallabag/impr/updates 
Update Alpine base image, envsubst and composer
 2025-07-18 13:00:47 +02:00
Kevin Decherf
0e11114336 Update composer to 2.8.10 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2025-07-18 01:04:02 +02:00
Kevin Decherf
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
Kevin Decherf
e1fafcc31f Update envsubst to v1.4.3 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2025-07-17 17:21:44 +02:00
Jérémy Benoist
7d2f4919c6 Merge pull request #426 from boraozgen/readme-update 
Update example compose file mariadb healthcheck command
 2025-06-05 09:01:48 +02:00
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
Bora Özgen
923dffae55 Update example compose file mariadb healthcheck command 2024-11-12 09:22:30 +01:00
6 changed files with 17 additions and 19 deletions
Expand all files Collapse all files

2
.github/workflows/publish.yml vendored
View File

@@ -13,7 +13,7 @@ jobs:
contents: read
steps:
- name: Check out the repo
uses: actions/checkout@v4
uses: actions/checkout@v5
- name: Log in to Docker Hub
uses: docker/login-action@v3

4
.github/workflows/test.yml vendored
View File

@@ -24,12 +24,12 @@ jobs:
steps:
- name: "Checkout"
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
fetch-depth: 2
- name: Set up Python
uses: actions/setup-python@v5
uses: actions/setup-python@v6
with:
python-version: 3.11

11
Dockerfile
View File

@@ -1,4 +1,4 @@
ARG COMPOSER_VERSION=2.5.8
ARG COMPOSER_VERSION=2.8.10
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
# this package is not available for ARM32 and we have to build it from source code
# 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
ARG WALLABAG_VERSION=2.6.11
ARG WALLABAG_VERSION=2.6.14
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"]

6
README.md
View File

@@ -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:

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

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

10
root/etc/wallabag/parameters.template.yml
View File

@@ -36,11 +36,11 @@ parameters:
rss_limit: 50
# RabbitMQ processing
rabbitmq_host: localhost
rabbitmq_port: 5672
rabbitmq_user: guest
rabbitmq_password: guest
rabbitmq_prefetch_count: 10
rabbitmq_host: ${SYMFONY__ENV__RABBITMQ_HOST:-localhost}
rabbitmq_port: ${SYMFONY__ENV__RABBITMQ_PORT:-5672}
rabbitmq_user: ${SYMFONY__ENV__RABBITMQ_USER:-guest}
rabbitmq_password: ${SYMFONY__ENV__RABBITMQ_PASSWORD:-guest}
rabbitmq_prefetch_count: ${SYMFONY__ENV__RABBITMQ_PREFETCH_COUNT:-10}
# Redis processing
redis_scheme: ${SYMFONY__ENV__REDIS_SCHEME:-tcp}