Merge branch 'master' into patch-1

This commit is contained in:
J. Scott Elblein
2023-07-24 07:56:12 -05:00
committed by GitHub
6 changed files with 64 additions and 21 deletions

View File

@ -5,11 +5,11 @@ FROM golang:alpine as builder
# flag -ldflags "-s -w" produces a smaller executable
RUN go install -ldflags "-s -w" -v github.com/a8m/envsubst/cmd/envsubst@v1.3.0
FROM alpine:3.17
FROM alpine:3.18
COPY --from=builder /go/bin/envsubst /usr/bin/envsubst
ARG WALLABAG_VERSION=2.6.1
ARG WALLABAG_VERSION=2.6.2
RUN set -ex \
&& apk add --no-cache \
@ -74,6 +74,8 @@ RUN set -ex \
&& rm -rf /root/.composer/* /var/www/wallabag/var/cache/* /var/www/wallabag/var/logs/* /var/www/wallabag/var/sessions/* \
&& chown -R nobody:nobody /var/www/wallabag
ENV PATH="${PATH}:/var/www/wallabag/bin"
# Set console entry path
WORKDIR /var/www/wallabag