diff --git a/.docker/Dockerfile-alpine b/.docker/Dockerfile-alpine index ee1f2b785f2..777b28325f0 100644 --- a/.docker/Dockerfile-alpine +++ b/.docker/Dockerfile-alpine @@ -1,8 +1,8 @@ -FROM alpine:3.15 +FROM alpine:3.15.1 RUN addgroup -S ory; \ adduser -S ory -G ory -D -H -s /bin/nologin -RUN apk add -U --no-cache ca-certificates +RUN apk --no-cache --update-cache --upgrade --latest add ca-certificates COPY hydra /usr/bin/hydra diff --git a/.docker/Dockerfile-build b/.docker/Dockerfile-build index 58a93c013a7..33cd65c644a 100644 --- a/.docker/Dockerfile-build +++ b/.docker/Dockerfile-build @@ -16,7 +16,7 @@ ADD . . RUN go build -tags sqlite -o /usr/bin/hydra -FROM alpine:3.15 +FROM alpine:3.15.1 RUN addgroup -S ory; \ adduser -S ory -G ory -D -h /home/ory -s /bin/nologin; \ diff --git a/.docker/Dockerfile-hsm b/.docker/Dockerfile-hsm index 22990662baf..ebcf045818c 100644 --- a/.docker/Dockerfile-hsm +++ b/.docker/Dockerfile-hsm @@ -1,6 +1,6 @@ FROM golang:1.16-alpine AS builder -RUN apk -U --no-cache add build-base git gcc bash +RUN apk --no-cache --update-cache --upgrade --latest add build-base git gcc bash WORKDIR /go/src/github.com/ory/hydra @@ -23,13 +23,13 @@ ENV HSM_LIBRARY=/usr/lib/softhsm/libsofthsm2.so ENV HSM_TOKEN_LABEL=hydra ENV HSM_PIN=1234 -RUN apk -U --no-cache add softhsm opensc; \ +RUN apk --no-cache --update-cache --upgrade --latest add softhsm opensc; \ pkcs11-tool --module /usr/lib/softhsm/libsofthsm2.so --slot 0 --init-token --so-pin 0000 --init-pin --pin 1234 --label hydra; \ go test -p 1 -v -failfast -short -tags=sqlite,hsm ./... -FROM alpine:3.14.2 +FROM alpine:3.15.1 -RUN apk -U --no-cache add softhsm opensc; \ +RUN apk --no-cache --update-cache --upgrade --latest add softhsm opensc; \ pkcs11-tool --module /usr/lib/softhsm/libsofthsm2.so --slot 0 --init-token --so-pin 0000 --init-pin --pin 1234 --label hydra RUN addgroup -S ory; \ diff --git a/.docker/Dockerfile-scratch b/.docker/Dockerfile-scratch index dafd2f60c53..5ba402dbd07 100644 --- a/.docker/Dockerfile-scratch +++ b/.docker/Dockerfile-scratch @@ -1,6 +1,6 @@ -FROM alpine:3.15 +FROM alpine:3.15.1 -RUN apk add -U --no-cache ca-certificates +RUN apk --no-cache --update-cache --upgrade --latest add ca-certificates # set up nsswitch.conf for Go's "netgo" implementation # - https://github.com/golang/go/blob/go1.9.1/src/net/conf.go#L194-L275 diff --git a/.docker/Dockerfile-sqlite b/.docker/Dockerfile-sqlite index e8534effa03..b46fb3613c0 100644 --- a/.docker/Dockerfile-sqlite +++ b/.docker/Dockerfile-sqlite @@ -1,4 +1,4 @@ -FROM alpine:3.15 +FROM alpine:3.15.1 # Because this image is built for SQLite, we create /home/ory and /home/ory/sqlite which is owned by the ory user # and declare /home/ory/sqlite a volume. @@ -10,7 +10,7 @@ FROM alpine:3.15 RUN addgroup -S ory; \ adduser -S ory -G ory -D -h /home/ory -s /bin/nologin; \ chown -R ory:ory /home/ory -RUN apk add -U --no-cache ca-certificates +RUN apk --no-cache --update-cache --upgrade --latest add ca-certificates WORKDIR /home/ory