test

baksetercx · May 14, 2024 · af4a422 · af4a422
1 parent 7667349
commit af4a422
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -54,7 +54,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           push: 'true'
-          tags: 'ghcr.io/${{ github.repository }}/${{ github.ref_name }}:latest'
+          tags: 'ghcr.io/${{ github.repository }}/${{ github.head_ref }}:latest'
           context: 'frontend'
 
   deploy:
@@ -63,7 +63,7 @@ jobs:
     needs: [build]
     env:
       TF_VAR_revision_suffix: ${{ github.sha }}
-      TF_VAR_my_name: ${{ github.ref_name }}
+      TF_VAR_my_name: ${{ github.head_ref }}
       TF_VAR_repository: ${{ github.repository }}
       ARM_CLIENT_ID: ${{ vars.ARM_CLIENT_ID }}
       ARM_SUBSCRIPTION_ID: ${{ vars.ARM_SUBSCRIPTION_ID }}

diff --git a/.github/workflows/destroy.yml b/.github/workflows/destroy.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       TF_VAR_revision_suffix: ${{ github.sha }}
-      TF_VAR_my_name: ${{ github.ref_name }}
+      TF_VAR_my_name: ${{ github.head_ref }}
       TF_VAR_repository: ${{ github.repository }}
       ARM_CLIENT_ID: ${{ vars.ARM_CLIENT_ID }}
       ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }}

diff --git a/README.md b/README.md
@@ -1,5 +1,6 @@
 # devops-workshop
 
+
 Lær hvordan du [deployer](https://teknisk-ordbok.fly.dev/ordbok/Deploy) koden din til [prod](https://teknisk-ordbok.fly.dev/ordbok/Produksjon)!
 
 # 🐳 Docker

diff --git a/terraform/main.tf b/terraform/main.tf
@@ -24,7 +24,7 @@ resource "azurerm_container_app" "devops" {
     #
     # container {
     #  image  = "ghcr.io/${var.repository}/${var.my_name}:latest"
-    }
+    # }
     # Answer T.2:
     container {
       name   = "devops-workshop"