From ca9c0e9730749436642785d904bdc2644fba1f3f Mon Sep 17 00:00:00 2001
From: Sergei Dorogin <segy@google.com>
Date: Wed, 9 Aug 2023 12:12:22 +0400
Subject: [PATCH] Moving to using Container Repository from Artifact Registry
 (due to numerous errors clients faced with creating AR)

Change-Id: Ida192d76da8bd0c5f1f984d8cd7379f79825172c
---
 gcp/cloudbuild-gcr.yaml |  5 +++++
 gcp/setup.sh            | 13 ++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 gcp/cloudbuild-gcr.yaml

diff --git a/gcp/cloudbuild-gcr.yaml b/gcp/cloudbuild-gcr.yaml
new file mode 100644
index 0000000..ae1ae60
--- /dev/null
+++ b/gcp/cloudbuild-gcr.yaml
@@ -0,0 +1,5 @@
+steps:
+- name: 'gcr.io/cloud-builders/docker'
+  args: [ 'build', '-t', 'gcr.io/$PROJECT_ID/${_IMAGE}', '-f', 'gcp/workload-vm/Dockerfile', '.' ]
+
+images: [ 'gcr.io/$PROJECT_ID/${_IMAGE}' ]
\ No newline at end of file
diff --git a/gcp/setup.sh b/gcp/setup.sh
index 0bae5c8..a82450c 100755
--- a/gcp/setup.sh
+++ b/gcp/setup.sh
@@ -56,7 +56,8 @@ deploy_files() {
 enable_apis() {
   echo "Enabling APIs"
   gcloud services enable compute.googleapis.com
-  gcloud services enable artifactregistry.googleapis.com
+  #gcloud services enable artifactregistry.googleapis.com
+  gcloud services enable containerregistry.googleapis.com
   gcloud services enable run.googleapis.com
   gcloud services enable cloudresourcemanager.googleapis.com
   gcloud services enable iamcredentials.googleapis.com
@@ -93,7 +94,7 @@ build_docker_image() {
 build_docker_image_gcr() {
   # NOTE: it's an alternative to build_docker_image if you want to use GCR instead of AR
   echo "Building and pushing Docker image to Container Registry"
-  gcloud builds submit --config=cloudbuild-gcr.yaml --substitutions=_IMAGE="workload" ./workload-vm
+  gcloud builds submit --config=cloudbuild-gcr.yaml --substitutions=_IMAGE="$IMAGE_NAME" ./..
 }
 
 
@@ -128,7 +129,8 @@ deploy_cf() {
   fi
   # initialize env.yaml - environment variables for CF:
   #   - docker image url
-  url="$REPOSITORY_LOCATION-docker.pkg.dev/$PROJECT_ID/docker/$IMAGE_NAME"
+  #url="$REPOSITORY_LOCATION-docker.pkg.dev/$PROJECT_ID/docker/$IMAGE_NAME"
+  url="gcr.io/$PROJECT_ID/$IMAGE_NAME"
   sed -i'.bak' -e "s|#*[[:space:]]*DOCKER_IMAGE[[:space:]]*:[[:space:]]*.*$|DOCKER_IMAGE: $url|" ./cloud-functions/create-vm/env.yaml
   #   - GCE VM name (base)
   instance=$(eval echo $(git config -f $SETTING_FILE compute.name))
@@ -305,8 +307,9 @@ enable_private_google_access() {
 deploy_all() {
   enable_apis
   set_iam_permissions
-  create_registry
-  build_docker_image
+  #create_registry
+  #build_docker_image
+  build_docker_image_gcr
   deploy_cf
   deploy_files
   schedule_run