diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 1641735..be2354a 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -14,10 +14,15 @@ jobs: # Stap 1: Code ophalen - uses: actions/checkout@v4 - # Stap 2: Versienummer ophalen uit package.json + # Stap 2: Versienummer ophalen uit package.json en opslaan als artifact - name: Extract Angular version - id: get_version - run: echo "::set-output name=version::$(cat package.json | jq -r '.version')" + run: | + echo "$(cat package.json | jq -r '.version')" > version.txt + - name: Save version as artifact + uses: actions/upload-artifact@v3 + with: + name: version + path: version.txt # Stap 3: Inloggen bij Docker Hub - name: Log in to Docker Hub @@ -28,11 +33,15 @@ jobs: # Stap 4: Docker-image bouwen en taggen met Angular-versie - name: Build the Docker image - run: docker build . --file Dockerfile --tag veenm/weetikveel:${{ steps.get_version.outputs.version }} --tag veenm/weetikveel:latest + run: | + VERSION=$(cat version.txt) + docker build . --file Dockerfile --tag veenm/weetikveel:$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:${{ steps.get_version.outputs.version }} + run: | + VERSION=$(cat version.txt) + docker push veenm/weetikveel:$VERSION # Stap 6: Docker-image pushen naar Docker Hub (latest tag) - name: Push the Docker image (latest) @@ -43,8 +52,17 @@ jobs: runs-on: ubuntu-latest steps: - # Stap 1: Code ophalen - - uses: actions/checkout@v4 + # Stap 1: Artifact ophalen + - name: Download version artifact + uses: actions/download-artifact@v3 + with: + name: version + + # Stap 2: Gebruik het versienummer in de deployment + - name: Use VERSION from artifact + run: | + VERSION=$(cat version.txt) + echo "De versie is: $VERSION" # Stap 3: Maak verbinding via SSH naar de TrueNAS SCALE server - name: SSH into TrueNAS SCALE @@ -64,7 +82,8 @@ jobs: k3s kubectl apply -f service.yaml # Update image in deployment - k3s kubectl set image deployment/weetikveel weetikveel=veenm/weetikveel:${{ needs.build-and-push.outputs.version }} --record + VERSION=$(cat version.txt) + k3s kubectl set image deployment/weetikveel weetikveel=veenm/weetikveel:$VERSION --record # Controle en status k3s kubectl rollout status deployment/weetikveel