Merge remote-tracking branch 'origin/master' into now-really-implemen…

…t-client-cli

# Conflicts:
#	docs/docs/quickstart.mdx
#	docs/docs/self-service/flows/account-recovery/password-reset-recovery-link.mdx

.circleci/config.yml

@@ -13,7 +13,7 @@ jobs:
   test:
     docker:
       -
-        image: circleci/golang:1.14
+        image: circleci/golang:1.15
         environment:
           - GO111MODULE=on
           - TEST_MAILHOG_SMTP=smtp://test:test@127.0.0.1:1025
@@ -38,7 +38,7 @@ jobs:
         environment:
           - MYSQL_ROOT_PASSWORD=test
       -
-        image: cockroachdb/cockroach:v19.2.0
+        image: cockroachdb/cockroach:v20.1.1
         command: start --insecure
       -
         image: oryd/hydra:v1.4.10
@@ -88,7 +88,7 @@ jobs:
           - POSTGRES_USER=test
           - POSTGRES_PASSWORD=test
           - POSTGRES_DB=kratos
-      - image: cockroachdb/cockroach:v2.1.6
+      - image: cockroachdb/cockroach:v20.1.1
         command: start --insecure
       - image: mysql:5.7
         environment:

.docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.11
+FROM alpine:3.12
 
 RUN addgroup -S ory; \
     adduser -S ory -G ory -D  -h /home/ory -s /bin/nologin; \
@@ -8,7 +8,7 @@ RUN apk add -U --no-cache ca-certificates
 
 COPY kratos /usr/bin/kratos
 
-# Exposing the ory home directory to simplify passing in Kratos configuration (e.g. if the file $HOME/.kratos.yaml 
+# Exposing the ory home directory to simplify passing in Kratos configuration (e.g. if the file $HOME/.kratos.yaml
 # exists, it will be automatically used as the configuration file).
 VOLUME /home/ory
 

.docker/Dockerfile-build

@@ -1,22 +1,22 @@
-FROM golang:1.14-alpine AS builder
+FROM golang:1.15-alpine AS builder
 
-RUN apk -U --no-cache add build-base git gcc
+RUN apk -U --no-cache add build-base git gcc bash
 
 WORKDIR /go/src/github.com/ory/kratos
 
 ADD go.mod go.mod
 ADD go.sum go.sum
 
+ENV GO111MODULE on
+ENV CGO_ENABLED 1
+
 RUN go mod download
-RUN GO111MODULE=on go install github.com/gobuffalo/packr/v2/packr2 github.com/markbates/pkger/cmd/pkger
 
 ADD . .
 
-RUN packr2
-RUN pkger
-RUN CGO_ENABLED=1 go build -tags sqlite -a -o /usr/bin/kratos
+RUN make pack && go build -tags sqlite -o /usr/bin/kratos
 
-FROM alpine:3.11
+FROM alpine:3.12
 
 RUN addgroup -S ory; \
     adduser -S ory -G ory -D  -h /home/ory -s /bin/nologin; \
@@ -30,7 +30,7 @@ RUN mkdir -p /var/lib/sqlite
 RUN chown ory:ory /var/lib/sqlite
 VOLUME /var/lib/sqlite
 
-# Exposing the ory home directory to simplify passing in Kratos configuration (e.g. if the file $HOME/.kratos.yaml 
+# Exposing the ory home directory to simplify passing in Kratos configuration (e.g. if the file $HOME/.kratos.yaml
 # exists, it will be automatically used as the configuration file).
 VOLUME /home/ory
 

.docker/Dockerfile-sqlite

@@ -1,4 +1,4 @@
-FROM alpine:3.11
+FROM alpine:3.12
 
 # 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.

.dockerignore

@@ -13,3 +13,4 @@ node_modules/
 ./quickstart-*.yml
 .bin/
 test/
+pgked.go

.golangci.yml

@@ -8,11 +8,11 @@ linters:
     - structcheck
     - typecheck
     - unused
-    - dupl
     - gosec
     - varcheck
   disable:
     - ineffassign
+    - dupl # https://github.com/ory/kratos/issues/680
     - godox
     - bodyclose # too many false negatives
 

.goreleaser.yml

@@ -8,9 +8,7 @@ env:
 before:
   hooks:
     - go mod download
-    - go install github.com/gobuffalo/packr/v2/packr2 github.com/markbates/pkger/cmd/pkger
-    - packr2
-    - pkger
+    - make pack
 
 builds:
   -