fix(ci): adjust cloudbuild variable name substitution AGAIN

PauloGoncalvesBH · PauloGoncalvesBH · commit b36f8be714f6 · 2023-09-06T16:15:29.000+01:00
diff --git a/.github/workflows/deploy-online-serverest.yml b/.github/workflows/deploy-online-serverest.yml
@@ -51,8 +51,7 @@ jobs:
       run: |
         gcloud builds submit . \
           --config=cloudbuild.yaml \
-          --substitutions=_COMMIT_SHA=${{ github.sha }} \
-          --substitutions=_VERSION=${{ github.ref_name }}
+          --substitutions=COMMIT_SHA=${{ github.sha }},_VERSION=${{ github.ref_name }}
 
   deploy-staging:
     name: Deploy on staging environment (staging.serverest.dev)
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
@@ -4,20 +4,20 @@ steps:
 - name: 'gcr.io/cloud-builders/docker'
   args: ['build',
         '--file', 'Dockerfile',
-        '--tag', 'gcr.io/${_PROJECT_ID}/${_SERVICE_NAME}:${_COMMIT_SHA}',
+        '--tag', 'gcr.io/${_PROJECT_ID}/${_SERVICE_NAME}:$COMMIT_SHA',
         '--tag', 'gcr.io/${_PROJECT_ID}/${_SERVICE_NAME}:${_VERSION}',
-        '--label', 'org.opencontainers.image.revision=${_COMMIT_SHA}',
+        '--label', 'org.opencontainers.image.revision=$COMMIT_SHA',
         '--label', 'org.opencontainers.image.source=github.com/ServeRest/ServeRest',
         '.']
 # Push the container image to Container Registry
 - name: 'gcr.io/cloud-builders/docker'
-  args: ['push', 'gcr.io/${_PROJECT_ID}/${_SERVICE_NAME}:${_COMMIT_SHA}']
+  args: ['push', 'gcr.io/${_PROJECT_ID}/${_SERVICE_NAME}:$COMMIT_SHA']
 - name: 'gcr.io/cloud-builders/docker'
   args: ['push', 'gcr.io/${_PROJECT_ID}/${_SERVICE_NAME}:${_VERSION}']
 substitutions: # default values
     _PROJECT_ID: serverest
     _SERVICE_NAME: app
 images: [
-  'gcr.io/${_PROJECT_ID}/${_SERVICE_NAME}:${_COMMIT_SHA}',
+  'gcr.io/${_PROJECT_ID}/${_SERVICE_NAME}:$COMMIT_SHA',
   'gcr.io/${_PROJECT_ID}/${_SERVICE_NAME}:${_VERSION}'
 ]
