It's the little things.... 27

collinlucke · Nov 21, 2024 · 5ac4792 · 5ac4792
1 parent a5e067f
commit 5ac4792
Showing 1 changed file with 30 additions and 29 deletions.
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -88,47 +88,48 @@ on:
 
 jobs:
   build:
-    runs-on: self-hosted
+    runs-on: self-hosted  # Use your self-hosted runner
     steps:
       - name: Checkout Source
         uses: actions/checkout@v4
 
       - name: Set Environment Variables
         shell: powershell
         run: |
-          echo "ATLAS_DB_PASSWORD=${{ secrets.ATLAS_DB_PASSWORD }}" >> ~/.env
-          echo "ATLAS_DB_USERNAME=${{ secrets.ATLAS_DB_USERNAME }}" >> ~/.env
-          echo "ATLAS_CLUSTER=${{ secrets.ATLAS_CLUSTER }}" >> ~/.env
-          echo "ATLAS_DB=${{ secrets.ATLAS_DB }}" >> ~/.env
-          echo "ACCESS_TOKEN_SECRET=${{ secrets.ACCESS_TOKEN_SECRET }}" >> ~/.env
-          echo "REFRESH_TOKEN_SECRET=${{ secrets.REFRESH_TOKEN_SECRET }}" >> ~/.env
-          echo "SSL_CERT=${{ secrets.IONOS_SSL_CERT }}" >> ~/.env
-          echo "SSL_PRIVATE_KEY=${{ secrets.IONOS_SSL_PRIVATE_KEY }}" >> ~/.env
-          echo "SSL_CERT_INTERMEDIATE=${{ secrets.IONOS_SSL_CERT_INTERMEDIATE }}" >> ~/.env
-
-      - name: Install Docker Compose
+          echo "ATLAS_DB_PASSWORD=${{ secrets.ATLAS_DB_PASSWORD }}" >> $env:GITHUB_ENV
+          echo "ATLAS_DB_USERNAME=${{ secrets.ATLAS_DB_USERNAME }}" >> $env:GITHUB_ENV
+          echo "ATLAS_CLUSTER=${{ secrets.ATLAS_CLUSTER }}" >> $env:GITHUB_ENV
+          echo "ATLAS_DB=${{ secrets.ATLAS_DB }}" >> $env:GITHUB_ENV
+          echo "ACCESS_TOKEN_SECRET=${{ secrets.ACCESS_TOKEN_SECRET }}" >> $env:GITHUB_ENV
+          echo "REFRESH_TOKEN_SECRET=${{ secrets.REFRESH_TOKEN_SECRET }}" >> $env:GITHUB_ENV
+          echo "SSL_CERT=${{ secrets.IONOS_SSL_CERT }}" >> $env:GITHUB_ENV
+          echo "SSL_PRIVATE_KEY=${{ secrets.IONOS_SSL_PRIVATE_KEY }}" >> $env:GITHUB_ENV
+          echo "SSL_CERT_INTERMEDIATE=${{ secrets.IONOS_SSL_CERT_INTERMEDIATE }}" >> $env:GITHUB_ENV
+
+      - name: Install Docker Compose (if needed)
         shell: powershell
         run: |
-         if (-not (Get-Command docker-compose -ErrorAction SilentlyContinue)) {
-          $installPath = "${{ runner.temp }}/docker-compose.exe"
-          Invoke-WebRequest -Uri "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-Windows-x86_64.exe" -OutFile $installPath
-          Move-Item -Path $installPath -Destination "C:\Program Files\Docker\Docker\resources\bin\docker-compose.exe"
-         }
+          if (-not (Get-Command docker-compose -ErrorAction SilentlyContinue)) {
+            $installPath = "${{ runner.temp }}/docker-compose.exe"
+            Invoke-WebRequest -Uri "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-Windows-x86_64.exe" -OutFile $installPath
+            Start-Process -FilePath "powershell.exe" -ArgumentList "-Command Move-Item -Path $installPath -Destination 'C:\Program Files\Docker\Docker\resources\bin\docker-compose.exe'" -Verb RunAs
+          }
 
       - name: Login to Docker Hub
         shell: powershell
-        run: docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
+        run: Start-Process -FilePath "docker" -ArgumentList "login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}" -Verb RunAs
 
-      - name: Build and Push Docker Images
+      - name: Build Docker Images
         shell: powershell
-        run: |
-          docker compose -f docker-compose.yml build
-          docker compose -f docker-compose.yml push
+        run: Start-Process -FilePath "docker-compose" -ArgumentList "-f docker-compose.yml build" -Verb RunAs
+
+      - name: Push Docker Images
+        shell: powershell
+        run: Start-Process -FilePath "docker-compose" -ArgumentList "-f docker-compose.yml push" -Verb RunAs
 
   deploy:
     needs: build
-    runs-on: self-hosted
-
+    runs-on: self-hosted  # Use your self-hosted runner for deployment
 
     steps:
       - name: Checkout Source
@@ -140,17 +141,17 @@ jobs:
           if (-not (Get-Command docker-compose -ErrorAction SilentlyContinue)) {
             $installPath = "${{ runner.temp }}/docker-compose.exe"
             Invoke-WebRequest -Uri "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-Windows-x86_64.exe" -OutFile $installPath
-            Move-Item -Path $installPath -Destination "C:\Program Files\Docker\Docker\resources\bin\docker-compose.exe"
+            Start-Process -FilePath "powershell.exe" -ArgumentList "-Command Move-Item -Path $installPath -Destination 'C:\Program Files\Docker\Docker\resources\bin\docker-compose.exe'" -Verb RunAs
           }
+
       - name: Pull Image from Docker Hub
         shell: powershell
-        run: docker compose -f docker-compose.yml pull
+        run: Start-Process -FilePath "docker-compose" -ArgumentList "-f docker-compose.yml pull" -Verb RunAs
 
       - name: Delete Old Container
         shell: powershell
-        run: docker rm -f baphomet-server-container
+        run: Start-Process -FilePath "docker" -ArgumentList "rm -f baphomet-server-container" -Verb RunAs
 
       - name: Run Docker Container
         shell: powershell
-        run: docker compose -f docker-compose.yml up -d
-
+        run: Start-Process -FilePath "docker-compose" -ArgumentList "-f docker-compose.yml up -d" -Verb RunAs