From e45b28fec626db35f1bd4580e5b11c9c94a02669 Mon Sep 17 00:00:00 2001 From: aeneasr <3372410+aeneasr@users.noreply.github.com> Date: Thu, 1 Apr 2021 12:18:27 +0200 Subject: [PATCH] fix: strict version enforcement in docker --- Makefile | 4 ++++ contrib/cat-videos-example/docker-compose.yml | 4 ++-- docker-compose-mysql.yml | 4 ++-- docker-compose-postgres.yml | 4 ++-- docker-compose.yml | 2 +- docs/docs/quickstart.mdx | 2 +- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index ec7c79e46..c26608684 100644 --- a/Makefile +++ b/Makefile @@ -38,6 +38,10 @@ format: .bin/goimports install: go install -tags sqlite . +.PHONY: docker +docker: + docker build -t oryd/keto:latest -f .docker/Dockerfile-build . + # Generates the SDKs .PHONY: sdk sdk: .bin/swagger .bin/cli diff --git a/contrib/cat-videos-example/docker-compose.yml b/contrib/cat-videos-example/docker-compose.yml index 013ef1f63..c42d60059 100644 --- a/contrib/cat-videos-example/docker-compose.yml +++ b/contrib/cat-videos-example/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: keto: - image: oryd/keto:latest + image: oryd/keto:v0.6.0-alpha.1 ports: - '4466:4466' - '4467:4467' @@ -14,7 +14,7 @@ services: target: /home/ory keto-init: - image: oryd/keto:latest + image: oryd/keto:v0.6.0-alpha.1 environment: - KETO_WRITE_REMOTE=keto:4467 volumes: diff --git a/docker-compose-mysql.yml b/docker-compose-mysql.yml index 06c952395..ca5a273e2 100644 --- a/docker-compose-mysql.yml +++ b/docker-compose-mysql.yml @@ -3,7 +3,7 @@ version: '3' services: keto-migrate: - image: oryd/keto:latest + image: oryd/keto:v0.6.0-alpha.1 links: - postgresd:postgresd environment: @@ -14,7 +14,7 @@ services: restart: on-failure keto: - image: oryd/keto:latest + image: oryd/keto:v0.6.0-alpha.1 links: - postgresd:postgresd depends_on: diff --git a/docker-compose-postgres.yml b/docker-compose-postgres.yml index 82af74b22..213a9c705 100644 --- a/docker-compose-postgres.yml +++ b/docker-compose-postgres.yml @@ -3,7 +3,7 @@ version: '3' services: keto-migrate: - image: oryd/keto:latest + image: oryd/keto:v0.6.0-alpha.1 links: - postgresd:postgresd environment: @@ -13,7 +13,7 @@ services: restart: on-failure keto: - image: oryd/keto:latest + image: oryd/keto:v0.6.0-alpha.1 links: - postgresd:postgresd depends_on: diff --git a/docker-compose.yml b/docker-compose.yml index c81e29a20..74c37ff7d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: keto: - image: oryd/keto:latest + image: oryd/keto:v0.6.0-alpha.1 ports: - "4466:4466" - "4467:4467" diff --git a/docs/docs/quickstart.mdx b/docs/docs/quickstart.mdx index a76ccecb8..d0244cea5 100644 --- a/docs/docs/quickstart.mdx +++ b/docs/docs/quickstart.mdx @@ -69,7 +69,7 @@ video service client would do. In this example we will use the Keto CLI client. If you want to run the Keto CLI within **Docker**, set the alias ```shell -alias keto="docker run -it --network cat-videos-example_default -e KETO_READ_REMOTE=\"keto:4466\" oryd/keto:latest" +alias keto="docker run -it --network cat-videos-example_default -e KETO_READ_REMOTE=\"keto:4466\" oryd/keto:v0.6.0-alpha.1" ``` in your terminal session. Alternatively, you need to set the remote endpoint so