From 3f622843686b6b5ac975ca01c23edaecc773dc9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Benoist?= Date: Sat, 21 May 2022 21:11:57 +0200 Subject: [PATCH 1/2] 2.5.0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 853e557..9791828 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.12 LABEL maintainer "Marvin Steadfast " -ARG WALLABAG_VERSION=2.4.3 +ARG WALLABAG_VERSION=2.5.0 RUN apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ --allow-untrusted ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php From 939b64442410bac6c333a893bded4ac9e11b2856 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sat, 21 May 2022 21:27:30 +0200 Subject: [PATCH 2/2] Update alpine image to 3.15 Also use latest Composer 2.2 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9791828..d0ba5ec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.12 +FROM alpine:3.15 LABEL maintainer "Marvin Steadfast " @@ -58,7 +58,7 @@ RUN set -ex \ && ln -sf /dev/stderr /var/log/nginx/error.log \ && curl -s https://getcomposer.org/installer | php \ && mv composer.phar /usr/local/bin/composer \ - && composer selfupdate 2.2.10 \ + && composer selfupdate 2.2.12 \ && git clone --branch $WALLABAG_VERSION --depth 1 https://github.com/wallabag/wallabag.git /var/www/wallabag COPY root /