Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: update alpine version #3036

Merged
merged 2 commits into from
Mar 17, 2022
Merged

fix: update alpine version #3036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d772a5
fix: update alpine version
Demonsthere Mar 17, 2022
a59eef0
resolve conflicts
Demonsthere Mar 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .docker/Dockerfile-alpine
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion .docker/Dockerfile-build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
Expand Down
8 changes: 4 additions & 4 deletions .docker/Dockerfile-hsm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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; \
Expand Down
4 changes: 2 additions & 2 deletions .docker/Dockerfile-scratch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions .docker/Dockerfile-sqlite
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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

Expand Down