fix: move to new post-release steps (ory#2206)

Makefile

@@ -16,7 +16,6 @@ GO_DEPENDENCIES = github.com/ory/go-acc \
 				  github.com/golang/mock/mockgen \
 				  github.com/go-swagger/go-swagger/cmd/swagger \
 				  golang.org/x/tools/cmd/goimports \
-				  github.com/mikefarah/yq \
 				  github.com/mattn/goveralls \
 				  github.com/cortesi/modd/cmd/modd
 
@@ -32,6 +31,10 @@ $(call make-lint-dependency)
 		echo "deprecated usage, use docs/cli instead"
 		go build -o .bin/clidoc ./cmd/clidoc/.
 
+.PHONY: .bin/yq
+.bin/yq:
+		go build -o .bin/yq github.com/mikefarah/yq/v4
+
 .PHONY: docs/cli
 docs/cli:
 		go run ./cmd/clidoc/. .
@@ -118,12 +121,12 @@ sdk: .bin/swagger .bin/ory node_modules
 quickstart:
 		docker pull oryd/kratos:latest
 		docker pull oryd/kratos-selfservice-ui-node:latest
-		docker-compose -f quickstart.yml -f quickstart-standalone.yml up --build --force-recreate
+		quickstart -f quickstart.yml -f quickstart-standalone.yml up --build --force-recreate
 
 .PHONY: quickstart-dev
 quickstart-dev:
 		docker build -f .docker/Dockerfile-build -t oryd/kratos:latest .
-		docker-compose -f quickstart.yml -f quickstart-standalone.yml -f quickstart-latest.yml $(QUICKSTART_OPTIONS) up --build --force-recreate
+		quickstart -f quickstart.yml -f quickstart-standalone.yml -f quickstart-latest.yml $(QUICKSTART_OPTIONS) up --build --force-recreate
 
 # Formats the code
 .PHONY: format
@@ -169,3 +172,9 @@ migratest-refresh:
 .PHONY: test-update-snapshots
 test-update-snapshots:
 		UPDATE_SNAPSHOTS=true go test -p 4 -tags sqlite -short ./...
+
+.PHONY: post-release
+post-release: .bin/yq
+		cat quickstart.yml | yq '.services.kratos.image = "oryd/kratos:'$$DOCKER_TAG'"' | sponge quickstart.yml
+		cat quickstart.yml | yq '.services.kratos-migrate.image = "oryd/kratos:'$$DOCKER_TAG'"' | sponge quickstart.yml
+		cat quickstart.yml | yq '.services.kratos-selfservice-ui-node.image = "oryd/kratos-selfservice-ui-node:'$$DOCKER_TAG'"' | sponge quickstart.yml

go.mod

@@ -53,7 +53,7 @@ require (
 	github.com/google/uuid v1.3.0
 	github.com/gorilla/sessions v1.2.1
 	github.com/gtank/cryptopasta v0.0.0-20170601214702-1f550f6f2f69
-	github.com/hashicorp/consul/api v1.5.0
+	github.com/hashicorp/consul/api v1.11.0
 	github.com/hashicorp/go-retryablehttp v0.7.0
 	github.com/hashicorp/golang-lru v0.5.4
 	github.com/imdario/mergo v0.3.12
@@ -65,6 +65,7 @@ require (
 	github.com/luna-duclos/instrumentedsql/opentracing v0.0.0-20201103091713-40d03108b6f4
 	github.com/mattn/goveralls v0.0.7
 	github.com/mikefarah/yq v1.15.0
+	github.com/mikefarah/yq/v4 v4.19.1
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826
 	github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe
 	github.com/ory/analytics-go/v4 v4.0.2
@@ -84,7 +85,7 @@ require (
 	github.com/rs/cors v1.8.0
 	github.com/sirupsen/logrus v1.8.1
 	github.com/slack-go/slack v0.7.4
-	github.com/spf13/cobra v1.2.1
+	github.com/spf13/cobra v1.3.0
 	github.com/spf13/pflag v1.0.5
 	github.com/sqs/goreturns v0.0.0-20181028201513-538ac6014518
 	github.com/stretchr/testify v1.7.0
@@ -94,7 +95,7 @@ require (
 	github.com/zmb3/spotify/v2 v2.0.0
 	golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
 	golang.org/x/net v0.0.0-20211020060615-d418f374d309
-	golang.org/x/oauth2 v0.0.0-20210810183815-faf39c7919d5
+	golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
 	golang.org/x/tools v0.1.7
 )

go_mod_indirect_pins.go

@@ -23,3 +23,5 @@ import (
 	_ "github.com/cortesi/modd/cmd/modd"
 	_ "github.com/hashicorp/consul/api"
 )
+
+import _ "github.com/mikefarah/yq/v4"

quickstart-crdb.yml

@@ -2,12 +2,10 @@ version: '3.7'
 
 services:
   kratos-migrate:
-    image: oryd/kratos:v0.8.2-alpha.1
     environment:
       - DSN=cockroach://root@cockroachd:26257/defaultdb?sslmode=disable&max_conns=20&max_idle_conns=4
 
   kratos:
-    image: oryd/kratos:v0.8.2-alpha.1
     environment:
       - DSN=cockroach://root@cockroachd:26257/defaultdb?sslmode=disable&max_conns=20&max_idle_conns=4
 

quickstart-mysql.yml

@@ -2,12 +2,10 @@ version: '3.7'
 
 services:
   kratos-migrate:
-    image: oryd/kratos:v0.8.2-alpha.1
     environment:
       - DSN=mysql://root:secret@tcp(mysqld:3306)/mysql?max_conns=20&max_idle_conns=4
 
   kratos:
-    image: oryd/kratos:v0.8.2-alpha.1
     environment:
       - DSN=mysql://root:secret@tcp(mysqld:3306)/mysql?max_conns=20&max_idle_conns=4
 

quickstart-postgres.yml

@@ -2,12 +2,10 @@ version: '3.7'
 
 services:
   kratos-migrate:
-    image: oryd/kratos:v0.8.2-alpha.1
     environment:
       - DSN=postgres://kratos:secret@postgresd:5432/kratos?sslmode=disable&max_conns=20&max_idle_conns=4
 
   kratos:
-    image: oryd/kratos:v0.8.2-alpha.1
     environment:
       - DSN=postgres://kratos:secret@postgresd:5432/kratos?sslmode=disable&max_conns=20&max_idle_conns=4
 

quickstart.yml

@@ -1,5 +1,4 @@
 version: '3.7'
-
 services:
   kratos-migrate:
     image: oryd/kratos:v0.8.2-alpha.1
@@ -17,16 +16,14 @@ services:
     restart: on-failure
     networks:
       - intranet
-
   kratos-selfservice-ui-node:
-    image: oryd/kratos-selfservice-ui-node:v0.8.0-alpha.3
+    image: oryd/kratos-selfservice-ui-node:v0.8.2-alpha.1
     environment:
       - KRATOS_PUBLIC_URL=http://kratos:4433/
       - KRATOS_BROWSER_URL=http://127.0.0.1:4433/
     networks:
       - intranet
     restart: on-failure
-
   kratos:
     depends_on:
       - kratos-migrate
@@ -49,17 +46,14 @@ services:
         target: /etc/config/kratos
     networks:
       - intranet
-
   mailslurper:
     image: oryd/mailslurper:latest-smtps
     ports:
       - '4436:4436'
       - '4437:4437'
     networks:
       - intranet
-
 networks:
   intranet:
-
 volumes:
   kratos-sqlite: