From 7e1c614d424dc8cd5fe06fedc7e7e9eb7c0ee6c1 Mon Sep 17 00:00:00 2001 From: Nim Jayawardena Date: Mon, 16 Sep 2024 15:41:27 -0400 Subject: [PATCH 1/3] chore: Migrate images from GCR to AR --- main.tf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/main.tf b/main.tf index 803ed30..2835932 100644 --- a/main.tf +++ b/main.tf @@ -19,8 +19,10 @@ data "google_project" "project" { } locals { - api_image = (var.database_type == "mysql" ? "gcr.io/sic-container-repo/todo-api" : "gcr.io/sic-container-repo/todo-api-postgres:latest") - fe_image = "gcr.io/sic-container-repo/todo-fe" + api_image = var.database_type == "mysql" + ? "us-docker.pkg.dev/google-samples/containers/jss/three-tier-web-app-api:v0.0.1" + : "us-docker.pkg.dev/google-samples/containers/jss/three-tier-web-app-api-postgres:v0.0.1" + fe_image = "us-docker.pkg.dev/google-samples/containers/jss/three-tier-web-app-fe:v0.0.1" api_env_vars_postgresql = { redis_host = google_redis_instance.main.host From 64e9910cc04f4a20023675ca9c17d866e6670d12 Mon Sep 17 00:00:00 2001 From: Nim Jayawardena Date: Mon, 16 Sep 2024 15:52:45 -0400 Subject: [PATCH 2/3] Fix lint issue --- main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.tf b/main.tf index 2835932..2b86f6a 100644 --- a/main.tf +++ b/main.tf @@ -19,9 +19,9 @@ data "google_project" "project" { } locals { - api_image = var.database_type == "mysql" + api_image = (var.database_type == "mysql" ? "us-docker.pkg.dev/google-samples/containers/jss/three-tier-web-app-api:v0.0.1" - : "us-docker.pkg.dev/google-samples/containers/jss/three-tier-web-app-api-postgres:v0.0.1" + : "us-docker.pkg.dev/google-samples/containers/jss/three-tier-web-app-api-postgres:v0.0.1") fe_image = "us-docker.pkg.dev/google-samples/containers/jss/three-tier-web-app-fe:v0.0.1" api_env_vars_postgresql = { From ef1a49ddc4c477160378cc8bf784e662db374da3 Mon Sep 17 00:00:00 2001 From: Nim Jayawardena Date: Mon, 16 Sep 2024 16:00:03 -0400 Subject: [PATCH 3/3] Fix lint issue --- main.tf | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/main.tf b/main.tf index 2b86f6a..6c51be5 100644 --- a/main.tf +++ b/main.tf @@ -19,9 +19,7 @@ data "google_project" "project" { } locals { - api_image = (var.database_type == "mysql" - ? "us-docker.pkg.dev/google-samples/containers/jss/three-tier-web-app-api:v0.0.1" - : "us-docker.pkg.dev/google-samples/containers/jss/three-tier-web-app-api-postgres:v0.0.1") + api_image = (var.database_type == "mysql" ? "us-docker.pkg.dev/google-samples/containers/jss/three-tier-web-app-api:v0.0.1" : "us-docker.pkg.dev/google-samples/containers/jss/three-tier-web-app-api-postgres:v0.0.1") fe_image = "us-docker.pkg.dev/google-samples/containers/jss/three-tier-web-app-fe:v0.0.1" api_env_vars_postgresql = {