Merge master -> saml

Co-authored-by: Thibault Herard <[email protected]>
ory · Apr 12, 2022 · 90e6e86 · 90e6e86
2 parents b6f8626 + aee2b1e
commit 90e6e86
Show file tree

Hide file tree

Showing 1,815 changed files with 22,590 additions and 235,340 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.docker/Dockerfile-alpine b/.docker/Dockerfile-alpine
@@ -1,4 +1,4 @@
-FROM alpine:3.15
+FROM alpine:3.15.1
 
 # Because this image supports 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 -u 10000 -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
 

diff --git a/.docker/Dockerfile-build b/.docker/Dockerfile-build
@@ -1,7 +1,7 @@
 # syntax = docker/dockerfile:1-experimental
 FROM golang:1.17-alpine3.15 AS base
 
-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/kratos
 
@@ -11,6 +11,7 @@ ADD internal/httpclient/go.* internal/httpclient/
 
 ENV GO111MODULE on
 ENV CGO_ENABLED 1
+ENV CGO_CPPFLAGS -DSQLITE_DEFAULT_FILE_PERMISSIONS=0600
 
 RUN go mod download
 
@@ -24,7 +25,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build go build -tags sqlite \
     -ldflags="-X 'github.com/ory/kratos/driver/config.Version=${VERSION}' -X 'github.com/ory/kratos/driver/config.Date=${BUILD_DATE}' -X 'github.com/ory/kratos/driver/config.Commit=${COMMIT}'" \
     -o /usr/bin/kratos
 
-FROM alpine:3.15.0
+FROM alpine:3.15.1
 
 RUN addgroup -S ory; \
     adduser -S ory -G ory -D -u 10000 -h /home/ory -s /bin/nologin; \