Skip to content

Commit

Permalink
Merge pull request #287 from wallabag/release/2.5.0
Browse files Browse the repository at this point in the history
2.5.0
  • Loading branch information
j0k3r committed May 21, 2022
2 parents 7a99f1e + 939b644 commit 1d42727
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM alpine:3.12
FROM alpine:3.15

LABEL maintainer "Marvin Steadfast <marvin@xsteadfastx.org>"

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
Expand Down Expand Up @@ -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 /
Expand Down

0 comments on commit 1d42727

Please sign in to comment.