Merge pull request 'Update base dependencies' (#5) from renovate/base-dependencies into main
All checks were successful
continuous-integration/drone/push Build is passing

Reviewed-on: #5
This commit is contained in:
Samuel Philipp 2021-02-01 20:20:59 +00:00
commit af5829632c

View file

@ -11,7 +11,7 @@ ENV MORTY_VERSION="f56efbfca411605bc7a2b5cc8fcad91df537a597"
WORKDIR $GOPATH/src/github.com/asciimoo/morty WORKDIR $GOPATH/src/github.com/asciimoo/morty
RUN apk upgrade --no-cache && \ RUN apk upgrade --no-cache && \
apk add --no-cache git="2.26.2-r0" && \ apk add --no-cache git="2.30.0-r0" && \
git clone https://github.com/asciimoo/morty.git . && \ git clone https://github.com/asciimoo/morty.git . && \
git checkout "${MORTY_VERSION}" git checkout "${MORTY_VERSION}"
@ -24,7 +24,7 @@ FROM arm64v8/alpine:3.13.1@sha256:019c59128325536e838a5f36028db214335129f9aa8321
FROM base-${ARCH} FROM base-${ARCH}
RUN apk upgrade --no-cache && \ RUN apk upgrade --no-cache && \
apk --no-cache add ca-certificates="20191127-r4" && \ apk --no-cache add ca-certificates="20191127-r5" && \
rm -f /var/cache/apk/* && \ rm -f /var/cache/apk/* && \
adduser -D -h /usr/local/morty -s /bin/false morty morty adduser -D -h /usr/local/morty -s /bin/false morty morty