Skip to content

Commit

Permalink
fix: resolve post-release steps (#838)
Browse files Browse the repository at this point in the history
  • Loading branch information
aeneasr authored Feb 10, 2022
1 parent dc3f90c commit d478567
Show file tree
Hide file tree
Showing 8 changed files with 188 additions and 28 deletions.
10 changes: 10 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ node_modules: package.json package-lock.json Makefile
.bin/clidoc:
go build -o .bin/clidoc ./cmd/clidoc/.

.PHONY: .bin/yq
.bin/yq:
go build -o .bin/yq github.com/mikefarah/yq/v4

docs/cli: .bin/clidoc
clidoc .

Expand Down Expand Up @@ -132,3 +136,9 @@ migrations-render-replace: .bin/ory
.PHONY:
cve-scan: docker .bin/grype
grype oryd/keto:latest

.PHONY:
post-release: .bin/yq
cat docker-compose.yml | yq '.services.keto.image = "oryd/keto:'$$DOCKER_TAG'"' | sponge docker-compose.yml
cat docker-compose-mysql.yml | yq '.services.keto-migrate.image = "oryd/keto:'$$DOCKER_TAG'"' | sponge docker-compose-mysql.yml
cat docker-compose-postgres.yml | yq '.services.keto-migrate.image = "oryd/keto:'$$DOCKER_TAG'"' | sponge docker-compose-postgres.yml
7 changes: 1 addition & 6 deletions docker-compose-mysql.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
version: '3.2'

services:

keto-migrate:
image: oryd/keto:v0.7.0-alpha.1
image: oryd/keto:v0.8.0-alpha.0
links:
- mysqld:mysqld
volumes:
Expand All @@ -15,9 +13,7 @@ services:
- DSN=mysql://root:secret@mysqld:3306/mysql&max_conns=20&max_idle_conns=4
command: ["migrate", "up", "-y"]
restart: on-failure

keto:
image: oryd/keto:v0.7.0-alpha.1
links:
- mysqld:mysqld
volumes:
Expand All @@ -31,7 +27,6 @@ services:
- keto-migrate
environment:
- DSN=mysql://root:secret@mysqld:3306/mysql&max_conns=20&max_idle_conns=4

mysqld:
image: mysql:5.7
ports:
Expand Down
7 changes: 1 addition & 6 deletions docker-compose-postgres.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
version: '3.2'

services:

keto-migrate:
image: oryd/keto:v0.7.0-alpha.1
image: oryd/keto:v0.8.0-alpha.0
links:
- postgresd:postgresd
volumes:
Expand All @@ -15,9 +13,7 @@ services:
- DSN=postgres://dbuser:secret@postgresd:5432/accesscontroldb?sslmode=disable
command: ["migrate", "up", "-y"]
restart: on-failure

keto:
image: oryd/keto:v0.7.0-alpha.1
links:
- postgresd:postgresd
volumes:
Expand All @@ -32,7 +28,6 @@ services:
environment:
- DSN=postgres://dbuser:secret@postgresd:5432/accesscontroldb?sslmode=disable
restart: on-failure

postgresd:
image: postgres:9.6
environment:
Expand Down
3 changes: 0 additions & 3 deletions docker-compose-tracing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,8 @@
# endpoint can only be used if you follow the steps in the tutorial. #
# #
###########################################################################

version: '3'

services:

keto:
depends_on:
- jaeger
Expand Down
3 changes: 1 addition & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
version: '3'

services:
keto:
image: oryd/keto:v0.6.0-alpha.1
image: oryd/keto:v0.8.0-alpha.0
ports:
- "4466:4466"
- "4467:4467"
Expand Down
18 changes: 13 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ require (
github.com/julienschmidt/httprouter v1.3.0
github.com/luna-duclos/instrumentedsql v1.1.3
github.com/luna-duclos/instrumentedsql/opentracing v0.0.0-20201103091713-40d03108b6f4
github.com/mikefarah/yq/v4 v4.19.1
github.com/ory/analytics-go/v4 v4.0.2
github.com/ory/graceful v0.1.2
github.com/ory/herodot v0.9.12
Expand All @@ -46,7 +47,7 @@ require (
github.com/segmentio/objconv v1.0.1
github.com/sirupsen/logrus v1.8.1
github.com/soheilhy/cmux v0.1.4
github.com/spf13/cobra v1.2.1
github.com/spf13/cobra v1.3.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.7.0
github.com/tidwall/gjson v1.9.4
Expand All @@ -66,6 +67,7 @@ require (
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/a8m/envsubst v1.3.0 // indirect
github.com/armon/go-radix v1.0.0 // indirect
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
github.com/aymerick/douceur v0.2.0 // indirect
Expand All @@ -87,6 +89,7 @@ require (
github.com/elastic/go-licenser v0.3.1 // indirect
github.com/elastic/go-sysinfo v1.7.1 // indirect
github.com/elastic/go-windows v1.0.1 // indirect
github.com/elliotchance/orderedmap v1.4.0 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/fatih/structs v1.1.0 // indirect
github.com/fsnotify/fsnotify v1.5.1 // indirect
Expand All @@ -106,6 +109,7 @@ require (
github.com/gobuffalo/plush/v4 v4.1.9 // indirect
github.com/gobuffalo/tags/v3 v3.1.2 // indirect
github.com/gobuffalo/validate/v3 v3.3.1 // indirect
github.com/goccy/go-yaml v1.9.5 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/glog v1.0.0 // indirect
github.com/golang/protobuf v1.5.2 // indirect
Expand All @@ -131,6 +135,7 @@ require (
github.com/jackc/pgx/v4 v4.13.0 // indirect
github.com/jandelgado/gcov2lcov v1.0.5 // indirect
github.com/jcchavezs/porto v0.3.0 // indirect
github.com/jinzhu/copier v0.3.5 // indirect
github.com/jmoiron/sqlx v1.3.4 // indirect
github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect
github.com/joho/godotenv v1.4.0 // indirect
Expand All @@ -141,13 +146,13 @@ require (
github.com/looplab/fsm v0.3.0 // indirect
github.com/magiconair/properties v1.8.5 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.11 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/microcosm-cc/bluemonday v1.0.16 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/mapstructure v1.4.2 // indirect
github.com/mitchellh/mapstructure v1.4.3 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
github.com/nyaruka/phonenumbers v1.0.73 // indirect
Expand Down Expand Up @@ -185,6 +190,8 @@ require (
github.com/subosito/gotenv v1.2.0 // indirect
github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/pretty v1.2.0 // indirect
github.com/timtadh/data-structures v0.5.3 // indirect
github.com/timtadh/lexmachine v0.2.2 // indirect
github.com/tinylib/msgp v1.1.6 // indirect
github.com/uber/jaeger-client-go v2.29.1+incompatible // indirect
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
Expand Down Expand Up @@ -215,9 +222,10 @@ require (
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
golang.org/x/tools v0.1.7 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/genproto v0.0.0-20211020151524-b7c3a969101a // indirect
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
gopkg.in/DataDog/dd-trace-go.v1 v1.33.0 // indirect
gopkg.in/ini.v1 v1.63.2 // indirect
gopkg.in/ini.v1 v1.66.2 // indirect
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
howett.net/plist v0.0.0-20201203080718-1454fab16a06 // indirect
Expand Down
Loading

0 comments on commit d478567

Please sign in to comment.