Fix deployment order (#52)

MinBZK · Jun 24, 2024 · f20743b · f20743b
2 parents 1094faa + e3cef0f
commit f20743b
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 42 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -243,6 +243,28 @@ jobs:
           if-no-files-found: error
           overwrite: true
 
+  deploy:
+    runs-on: ubuntu-latest
+    needs: [build]
+    if: ${{ github.event_name == 'push' }}
+    permissions:
+      actions: write
+    steps:
+      - name: Extract metadata for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+        env:
+          DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
+
+      - name: Trigger deployment
+        run: |
+          gh workflow run deploy.yml -f image_tag=${{ steps.meta.outputs.tags }} -f environment=production
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+
   notifyMattermost:
     runs-on: ubuntu-latest
     needs: [lint, security, test, build ]

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -1,10 +1,6 @@
 name: deploy
 
-
 on:
-  push:
-    branches:
-      - main
   workflow_dispatch:
       inputs:
         image_tag:
@@ -28,47 +24,14 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-        with:
-          path: 'source/tad/'
-
-      - name: get commit hash
-        id: get_commit_hash
-        run: |
-          cd source/tad/
-          echo "commit_hash=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
-
-
       - name: Get GHCR package hash
         id: get_package_hash
         run: |
-          if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
             container_id=$(gh api --paginate -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" /orgs/MinBZK/packages/container/tad/versions | jq -r '.[] | select(.metadata.container.tags | contains(["${{ inputs.image_tag }}"])) | .name')
             echo "container_id=$container_id" >> "$GITHUB_OUTPUT"
-          else
-            container_id=$(gh api --paginate -H "Accept: application/vnd.github+json" -H "X-GitHub-Api-Version: 2022-11-28" /orgs/MinBZK/packages/container/tad/versions | jq -r '.[] | select(.metadata.container.tags | contains(["main"])) | .name')
-            echo "container_id=$container_id" >> "$GITHUB_OUTPUT"
-          fi
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Get deploy environment
-        id: get_deploy_env
-        run: |
-          if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
-              echo "env=${{ inputs.environment }}" >> "$GITHUB_OUTPUT"
-          else
-             echo "env=sandbox" >> "$GITHUB_OUTPUT"
-          fi
-
-      - name: Print deploy hash and environment
-        run: |
-           echo "Container ID: ${{ steps.get_package_hash.outputs.container_id }}"
-           echo "Overlay: ${{ steps.get_deploy_env.outputs.env }}"
-           echo "Version:  ${{ inputs.image_tag || 'main' }}"
-           echo "Actor: ${{ github.actor}}"
-           echo "Commit: ${{ steps.get_commit_hash.outputs.commit_hash }}"
-
       - name: check correct name
         run: |
             if [ -z "${{steps.get_package_hash.outputs.container_id}}" ]; then
@@ -90,17 +53,16 @@ jobs:
 
       - name: Make changes to the file
         run: |
-          sed -i 's/newTag: .*$/newTag: ${{inputs.image_tag || 'main' }}@${{ steps.get_package_hash.outputs.container_id }}/g' apps/tad/overlays/${{ steps.get_deploy_env.outputs.env }}/kustomization.yaml
-          sed -i 's/commithash: .*$/commithash: ${{ steps.get_commit_hash.outputs.commit_hash }}/g' apps/tad/overlays/${{ steps.get_deploy_env.outputs.env }}/kustomization.yaml
-          sed -i 's|minbzk.github.io/version: .*$|minbzk.github.io/version: ${{ inputs.image_tag || 'main' }}|g' apps/tad/overlays/${{ steps.get_deploy_env.outputs.env }}/kustomization.yaml
-          git add apps/tad/overlays/${{ steps.get_deploy_env.outputs.env }}/kustomization.yaml
+          sed -i 's/newTag: .*$/newTag: ${{inputs.image_tag  }}@${{ steps.get_package_hash.outputs.container_id }}/g' apps/tad/overlays/${{ inputs.environment }}/kustomization.yaml
+          sed -i 's|minbzk.github.io/version: .*$|minbzk.github.io/version: ${{ inputs.image_tag }}|g' apps/tad/overlays/${{ inputs.environment }}/kustomization.yaml
+          git add apps/tad/overlays/${{ inputs.environment }}/kustomization.yaml
 
       - name: show changes
         run: git diff --staged
 
       - name: push changes
         run: |
-          git commit -m "Update tad overlay ${{ steps.get_deploy_env.outputs.env }} tag ${{ steps.get_package_hash.outputs.container_id }} by actor ${{ github.actor}}"
+          git commit -m "Update tad overlay ${{ inputs.environment }} tag ${{ steps.get_package_hash.outputs.container_id }}"
           git push --force-with-lease
         env:
           GITHUB_TOKEN: ${{ secrets.GH_PAT }}