From 9af54e96716f01e7872df79ff183c713f56b6cd2 Mon Sep 17 00:00:00 2001
From: Mel van Veen <80211199+veenm@users.noreply.github.com>
Date: Tue, 3 Dec 2024 09:48:44 +0100
Subject: [PATCH] Update docker-image.yml

---
 .github/workflows/docker-image.yml | 31 +++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 79082fc..0486c10 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -6,9 +6,6 @@ on:
   pull_request:
     branches: [ "main" ]
 
-env:
-  VERSION: "$(cat package.json | jq -r '.version')"
-
 jobs:
   build-and-push:
     runs-on: ubuntu-latest
@@ -20,7 +17,7 @@ jobs:
     # Stap 2: Versienummer ophalen uit package.json
     - name: Extract Angular version
       id: get_version
-      run: echo "VERSION=$(cat package.json | jq -r '.version')" >> $GITHUB_ENV
+      run: echo "::set-output name=version::$(cat package.json | jq -r '.version')"
 
     # Stap 3: Inloggen bij Docker Hub
     - name: Log in to Docker Hub
@@ -31,12 +28,12 @@ jobs:
 
     # Stap 4: Docker-image bouwen en taggen met Angular-versie
     - name: Build the Docker image
-      run: docker build . --file Dockerfile --tag veenm/weetikveel:${{ env.VERSION }} --tag veenm/weetikveel:latest
+      run: docker build . --file Dockerfile --tag veenm/weetikveel:${{ steps.get_version.outputs.version }} --tag veenm/weetikveel:latest
 
     # Stap 5: Docker-image pushen naar Docker Hub (huidige versie tag)
     - name: Push the Docker image (version)
-      run: docker push veenm/weetikveel:${{ env.VERSION }}
-      
+      run: docker push veenm/weetikveel:${{ steps.get_version.outputs.version }}
+
     # Stap 6: Docker-image pushen naar Docker Hub (latest tag)
     - name: Push the Docker image (latest)
       run: docker push veenm/weetikveel:latest
@@ -46,10 +43,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+    # Stap 1: Code ophalen
+    - uses: actions/checkout@v4
 
-    - name: Use Variable
-      run: echo "${{ env.VERSION }}"
-    # Stap 1: Maak verbinding via SSH naar de TrueNAS SCALE server
+    # Stap 2: Gebruik de versie uit de vorige job
+    - name: Read Version
+      run: echo "De versie is: ${{ needs.build-and-push.outputs.version }}" 
+
+    # Stap 3: Maak verbinding via SSH naar de TrueNAS SCALE server
     - name: SSH into TrueNAS SCALE
       uses: appleboy/ssh-action@v0.1.10
       with:
@@ -58,18 +59,18 @@ jobs:
         password: ${{ secrets.TRUENAS_PASSWORD }}
         port: ${{ secrets.TRUENAS_PORT }}
         script: |
-          # Stap 2: K3s Kubernetes-configuratie instellen
+          # Kubernetes-configuratie instellen
           export KUBEVERSION=/etc/rancher/k3s/k3s.yaml
           export KUBECONFIG=$KUBEVERSION
 
+          # Update deployment
           k3s kubectl apply -f deployment.yaml
-          
           k3s kubectl apply -f service.yaml
 
-          # Stap 4: Update de Kubernetes deployment (optioneel, vervang bestaande image)
-          k3s kubectl set image deployment/weetikveel weetikveel=veenm/weetikveel:${{ env.VERSION }} --record
+          # Update image in deployment
+          k3s kubectl set image deployment/weetikveel weetikveel=veenm/weetikveel:${{ needs.build-and-push.outputs.version }} --record
 
-          # Stap 5: Controleer de status van de pods en services
+          # Controle en status
           k3s kubectl rollout status deployment/weetikveel
           k3s kubectl get pods
           k3s kubectl get service