From df85f7da5c7bdadc75fc3fd88471d1eff50e2f0f Mon Sep 17 00:00:00 2001
From: veenm <vanveenmel11@gmail.com>
Date: Sun, 23 Mar 2025 21:28:14 +0100
Subject: [PATCH] pipeline fix v10

---
 .github/workflows/deploy-docker-to-tst.yml | 42 ++++++++++++++++------
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/deploy-docker-to-tst.yml b/.github/workflows/deploy-docker-to-tst.yml
index fbccf2f..5e14484 100644
--- a/.github/workflows/deploy-docker-to-tst.yml
+++ b/.github/workflows/deploy-docker-to-tst.yml
@@ -103,33 +103,53 @@ jobs:
         id: read_version
         run: echo "VERSION=$(cat version.txt)" >> $GITHUB_ENV
 
-      # Stap 3: Maak verbinding via SSH naar de Alpine server en update de container
       - name: SSH into Alpine and update Docker container
         uses: appleboy/ssh-action@v0.1.10
         with:
           host: ${{ secrets.ALPINE_HOST }}
           username: ${{ secrets.ALPINE_USER }}
           password: ${{ secrets.ALPINE_PASSWORD }}
+          envs: VERSION,DB_HOST,DB_PORT,DB_USERNAME,DB_PASSWORD,CORS_ORIGINS,MAILER_FROM,MAILER_HOST,MAILER_PORT,MAILER_USERNAME,MAILER_PASSWORD
           script: |
-            VERSION=${{ env.VERSION }}
             echo "Gekozen versie: $VERSION"
-
-            # Stop en verwijder de huidige container
+            
             docker stop paypoint-backend || true
             docker rm paypoint-backend || true
-
-            # Haal de nieuwste image binnen
-            docker pull veenm/paypoint-backend-jvm:$VERSION
-
-            # Start een nieuwe container
-            docker run -d --name paypoint-backend --restart unless-stopped -p 15000:8080 -e DB_HOST=${{ secrets.ALPINE_HOST }} -e DB_PORT=${{ secrets.DB_PORT_TEST }} -e DB_USERNAME=${{ secrets.DB_USERNAME_TEST }} -e DB_PASSWORD=${{ secrets.DB_PASSWORD_TEST }} -e CORS_ORIGINS=${{ secrets.CORS_ORIGINS_TEST }} -e MAILER_FROM=${{ secrets.MAILER_FROM }} -e MAILER_HOST=${{ secrets.MAILER_HOST }} -e MAILER_PORT=${{ secrets.MAILER_PORT }} -e MAILER_USERNAME=${{ secrets.MAILER_USERNAME }} -e MAILER_PASSWORD=${{ secrets.MAILER_PASSWORD }} veenm/paypoint-backend-jvm:$VERSION
             
-            # Opruimen oude images
+            docker pull veenm/paypoint-backend-jvm:$VERSION
+            
+            docker run -d --name paypoint-backend --restart unless-stopped -p 15000:8080 \
+              -e DB_HOST="$DB_HOST" \
+              -e DB_PORT="$DB_PORT" \
+              -e DB_USERNAME="$DB_USERNAME" \
+              -e DB_PASSWORD="$DB_PASSWORD" \
+              -e CORS_ORIGINS="$CORS_ORIGINS" \
+              -e MAILER_FROM="$MAILER_FROM" \
+              -e MAILER_HOST="$MAILER_HOST" \
+              -e MAILER_PORT="$MAILER_PORT" \
+              -e MAILER_USERNAME="$MAILER_USERNAME" \
+              -e MAILER_PASSWORD="$MAILER_PASSWORD" \
+              veenm/paypoint-backend-jvm:$VERSION
+            
             docker image prune -f
+        env:
+          VERSION: ${{ env.VERSION }}
+          DB_HOST: ${{ secrets.ALPINE_HOST }}
+          DB_PORT: ${{ secrets.DB_PORT_TEST }}
+          DB_USERNAME: ${{ secrets.DB_USERNAME_TEST }}
+          DB_PASSWORD: ${{ secrets.DB_PASSWORD_TEST }}
+          CORS_ORIGINS: ${{ secrets.CORS_ORIGINS_TEST }}
+          MAILER_FROM: ${{ secrets.MAILER_FROM }}
+          MAILER_HOST: ${{ secrets.MAILER_HOST }}
+          MAILER_PORT: ${{ secrets.MAILER_PORT }}
+          MAILER_USERNAME: ${{ secrets.MAILER_USERNAME }}
+          MAILER_PASSWORD: ${{ secrets.MAILER_PASSWORD }}
+
 
       # Stap 4: Notify Mattermost via Bot (Build is geslaagd)
       - name: Notify Mattermost via Bot
         env:
+          MATTERMOST_BOT_TOKEN: ${{ secrets.MATTERMOST_BOT_TOKEN }}
           VERSION: ${{ env.VERSION }}
         run: |
           curl --fail -X POST -H "Authorization: Bearer $MATTERMOST_BOT_TOKEN" \