From cd1c6a4b17e652292208ee260aa4c6069f95be15 Mon Sep 17 00:00:00 2001 From: Tim Vaillancourt Date: Mon, 10 Jul 2023 19:24:20 +0200 Subject: [PATCH 1/3] compose: fix `consul:latest` error Signed-off-by: Tim Vaillancourt --- examples/compose/docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/compose/docker-compose.yml b/examples/compose/docker-compose.yml index 17f9e5fe65e..f0b869781de 100644 --- a/examples/compose/docker-compose.yml +++ b/examples/compose/docker-compose.yml @@ -2,7 +2,7 @@ services: consul1: command: agent -server -bootstrap-expect 3 -ui -disable-host-node-id -client 0.0.0.0 hostname: consul1 - image: consul:latest + image: hashicorp/consul:latest ports: - 8400:8400 - 8500:8500 @@ -16,7 +16,7 @@ services: - "8500" - "8600" hostname: consul2 - image: consul:latest + image: hashicorp/consul:latest consul3: command: agent -server -retry-join consul1 -disable-host-node-id depends_on: @@ -26,7 +26,7 @@ services: - "8500" - "8600" hostname: consul3 - image: consul:latest + image: hashicorp/consul:latest external_db_host: build: context: ./external_db/mysql From 530021e99f6be17bb7605efc2fb7ef561217e335 Mon Sep 17 00:00:00 2001 From: Tim Vaillancourt Date: Mon, 10 Jul 2023 19:54:58 +0200 Subject: [PATCH 2/3] Update docker-compose.beginners.yml too Signed-off-by: Tim Vaillancourt --- examples/compose/.env | 1 + examples/compose/docker-compose.beginners.yml | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/examples/compose/.env b/examples/compose/.env index 0f008404ea9..3d88b5f83e5 100644 --- a/examples/compose/.env +++ b/examples/compose/.env @@ -7,6 +7,7 @@ CELL=local KEYSPACE=commerce DB=commerce +VITESS_TAG:v14.0.5 EXTERNAL_DB=0 DB_HOST=external_db_host DB_PORT=3306 diff --git a/examples/compose/docker-compose.beginners.yml b/examples/compose/docker-compose.beginners.yml index bf916df0e42..d647d9fdc4d 100644 --- a/examples/compose/docker-compose.beginners.yml +++ b/examples/compose/docker-compose.beginners.yml @@ -1,7 +1,7 @@ version: "2.1" services: consul1: - image: consul:latest + image: hashicorp/consul:latest hostname: "consul1" ports: - "8400:8400" @@ -9,7 +9,7 @@ services: - "8600:8600" command: "agent -server -bootstrap-expect 3 -ui -disable-host-node-id -client 0.0.0.0" consul2: - image: consul:latest + image: hashicorp/consul:latest hostname: "consul2" expose: - "8400" @@ -19,7 +19,7 @@ services: depends_on: - consul1 consul3: - image: consul:latest + image: hashicorp/consul:latest hostname: "consul3" expose: - "8400" From 96474f454f3b2c15d579a7dd5aea75ce934dddf9 Mon Sep 17 00:00:00 2001 From: Tim Vaillancourt Date: Mon, 10 Jul 2023 19:55:34 +0200 Subject: [PATCH 3/3] rm mistaken commit Signed-off-by: Tim Vaillancourt --- examples/compose/.env | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/compose/.env b/examples/compose/.env index 3d88b5f83e5..0f008404ea9 100644 --- a/examples/compose/.env +++ b/examples/compose/.env @@ -7,7 +7,6 @@ CELL=local KEYSPACE=commerce DB=commerce -VITESS_TAG:v14.0.5 EXTERNAL_DB=0 DB_HOST=external_db_host DB_PORT=3306