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.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
...
compare: public:master
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

4 Commits
2.6.14 ... master

Author SHA1 Message Date
Jérémy Benoist
1e28e25500 Merge pull request #467 from paper42/upgrades-2025 2025-11-27 06:52:35 +01:00
Emi Vasilková
bfb9e7dc40 dependency upgrades 
* use LTS version of composer
* use a maintained version of alpine
* upgrade php to 8.4 (because 8.1 was dropped from alpine and it's
  almost EOL)
 2025-11-27 00:33:12 +01:00
Jérémy Benoist
b133e9559d Merge pull request #466 from wallabag/dependabot/github_actions/actions/checkout-6 2025-11-24 06:52:21 +01:00
dependabot[bot]
b0b760a765 Bump actions/checkout from 5 to 6 
Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6.
- [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/v5...v6)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2025-11-24 03:28:14 +00:00
4 changed files with 39 additions and 39 deletions
Expand all files Collapse all files

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

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

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

@@ -24,7 +24,7 @@ jobs:
steps: steps:
- name: "Checkout" - name: "Checkout"
uses: actions/checkout@v5 uses: actions/checkout@v6
with: with:
fetch-depth: 2 fetch-depth: 2

72
Dockerfile
View File

@@ -1,15 +1,15 @@
ARG COMPOSER_VERSION=2.8.10 ARG COMPOSER_VERSION=2.2
FROM composer:$COMPOSER_VERSION as composer FROM composer:$COMPOSER_VERSION AS composer
FROM golang:alpine as builder 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.4.3 RUN go install -ldflags "-s -w" -v github.com/a8m/envsubst/cmd/envsubst@v1.4.3
FROM alpine:3.19 FROM alpine:3.22
COPY --from=builder /go/bin/envsubst /usr/bin/envsubst COPY --from=builder /go/bin/envsubst /usr/bin/envsubst
@@ -21,43 +21,43 @@ RUN set -ex \
libwebp \ libwebp \
nginx \ nginx \
pcre \ pcre \
php81 \ php84 \
php81-bcmath \ php84-bcmath \
php81-ctype \ php84-ctype \
php81-curl \ php84-curl \
php81-dom \ php84-dom \
php81-fpm \ php84-fpm \
php81-gd \ php84-gd \
php81-gettext \ php84-gettext \
php81-iconv \ php84-iconv \
php81-json \ php84-json \
php81-mbstring \ php84-mbstring \
php81-opcache \ php84-opcache \
php81-openssl \ php84-openssl \
php81-pecl-amqp \ php84-pecl-amqp \
php81-pecl-imagick \ php84-pecl-imagick \
php81-pdo_mysql \ php84-pdo_mysql \
php81-pdo_pgsql \ php84-pdo_pgsql \
php81-pdo_sqlite \ php84-pdo_sqlite \
php81-phar \ php84-phar \
php81-session \ php84-session \
php81-simplexml \ php84-simplexml \
php81-tokenizer \ php84-tokenizer \
php81-xml \ php84-xml \
php81-zlib \ php84-zlib \
php81-sockets \ php84-sockets \
php81-xmlreader \ php84-xmlreader \
php81-tidy \ php84-tidy \
php81-intl \ php84-intl \
php81-sodium \ php84-sodium \
mariadb-client \ mariadb-client \
postgresql14-client \ postgresql17-client \
rabbitmq-c \ rabbitmq-c \
s6 \ s6 \
tar \ tar \
tzdata \ tzdata \
&& ln -sf /usr/bin/php81 /usr/bin/php \ && ln -sf /usr/bin/php84 /usr/bin/php \
&& ln -sf /usr/sbin/php-fpm81 /usr/sbin/php-fpm \ && ln -sf /usr/sbin/php-fpm84 /usr/sbin/php-fpm \
&& rm -rf /var/cache/apk/* \ && rm -rf /var/cache/apk/* \
&& ln -sf /dev/stdout /var/log/nginx/access.log \ && ln -sf /dev/stdout /var/log/nginx/access.log \
&& ln -sf /dev/stderr /var/log/nginx/error.log && ln -sf /dev/stderr /var/log/nginx/error.log

2
root/entrypoint.sh
View File

@@ -28,7 +28,7 @@ provisioner() {
# Replace environment variables # Replace environment variables
envsubst < /etc/wallabag/parameters.template.yml > app/config/parameters.yml envsubst < /etc/wallabag/parameters.template.yml > app/config/parameters.yml
envsubst < /etc/wallabag/php-wallabag.template.ini > /etc/php81/conf.d/50_wallabag.ini envsubst < /etc/wallabag/php-wallabag.template.ini > /etc/php84/conf.d/50_wallabag.ini
# Wait for external database # Wait for external database
if [ "$SYMFONY__ENV__DATABASE_DRIVER" = "pdo_mysql" ] || [ "$SYMFONY__ENV__DATABASE_DRIVER" = "pdo_pgsql" ] ; then if [ "$SYMFONY__ENV__DATABASE_DRIVER" = "pdo_mysql" ] || [ "$SYMFONY__ENV__DATABASE_DRIVER" = "pdo_pgsql" ] ; then