use github ref name in the image name creation

sFractal-Podii · Oct 26, 2023 · 968d747 · 968d747
1 parent 9aa11ed
commit 968d747
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/.github/workflows/alpha-deploy.yml b/.github/workflows/alpha-deploy.yml
@@ -2,10 +2,8 @@ name: Alpha Deploy
 
 on: 
   push:
-    branches:
-      - fix/deployment_alpha_prod
-    # tags:
-    # - v*-alpha
+    tags:
+    - v*-alpha
 
 env:
   PROJECT_ID: ${{ secrets.GCE_PROJECT }}
@@ -46,17 +44,17 @@ jobs:
     - name: Build
       run: | 
         echo '${{ secrets.RELEASES_SECRETS }}' >> config/releases.exs
-        docker build --tag "gcr.io/duncan-openc2-plugfest/twinklyhaha:v0.2.3" .
+        docker build --tag "gcr.io/duncan-openc2-plugfest/twinklyhaha:${GITHUB_REF_NAME}" .
 
     # Push the Docker image to Google Container Registry
     - name: Publish
       run: |-
-        docker push "gcr.io/duncan-openc2-plugfest/twinklyhaha:${GITHUB_REF##*/}"
+        docker push "gcr.io/duncan-openc2-plugfest/twinklyhaha:${GITHUB_REF_NAME}"
     
     - name: Deploy to Cloud Run 
       id: deploy
       uses: google-github-actions/deploy-cloudrun@v0
       with:
         service: twinklyhaha-alpha
         region: us-east4
-        image: "gcr.io/duncan-openc2-plugfest/twinklyhaha:${GITHUB_REF##*/}"
+        image: "gcr.io/duncan-openc2-plugfest/twinklyhaha:${{ github.ref_name }}"
diff --git a/.github/workflows/prod-deploy.yaml b/.github/workflows/prod-deploy.yaml
@@ -59,17 +59,17 @@ jobs:
     - name: Build
       run: |
         echo '${{ secrets.RELEASES_SECRETS }}' >> config/releases.exs
-        docker build --tag "gcr.io/duncan-openc2-plugfest/twinklyhaha:${GITHUB_REF##*/}" .
+        docker build --tag "gcr.io/duncan-openc2-plugfest/twinklyhaha:${GITHUB_REF_NAME}" .
 
     # Push the Docker image to Google Container Registry
     - name: Publish
       run: |-
-        docker push "gcr.io/duncan-openc2-plugfest/twinklyhaha:${GITHUB_REF##*/}"
+        docker push "gcr.io/duncan-openc2-plugfest/twinklyhaha:${GITHUB_REF_NAME}"
 
     - name: Deploy
       id: deploy
       uses: google-github-actions/deploy-cloudrun@v0
       with:
         service: twinklyhaha
         region: us-east4
-        image: "gcr.io/duncan-openc2-plugfest/twinklyhaha:${GITHUB_REF##*/}"
+        image: "gcr.io/duncan-openc2-plugfest/twinklyhaha:${{ github.ref_name }}"