It's the little things.... 21

collinlucke · Nov 21, 2024 · 0c37a68 · 0c37a68
1 parent 0f69e47
commit 0c37a68
Showing 1 changed file with 19 additions and 19 deletions.
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -13,7 +13,7 @@
 #         uses: actions/checkout@v4
 
 #       - name: Set Environment Variables
-#         shell: pwsh
+#    
         # env:
         #   ATLAS_DB_PASSWORD: ${{ secrets.ATLAS_DB_PASSWORD }}
         #   ATLAS_DB_USERNAME: ${{ secrets.ATLAS_DB_USERNAME }}
@@ -43,18 +43,18 @@
       #     ln -s /usr/local/bin/docker-compose /usr/bin/docker-compose
 
   #     - name: Install Docker Compose
-  #       shell: pwsh
+  #  
   #       run: |
   #         $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
   #         [System.IO.File]::Move($installPath, "${{ env:ProgramFiles }}\Docker\Docker\resources\bin\docker-compose.exe")
 
   #     - name: Login to Docker Hub
-  #       shell: pwsh
+  #  
   #       run: docker login -u ${{secrets.DOCKER_USERNAME}} -p ${{secrets.DOCKER_PASSWORD}}
 
   #     - name: Build and Push Docker Images
-  #       shell: pwsh
+  #  
   #       run: |
   #         docker compose -f docker-compose.yml build
   #         docker compose -f docker-compose.yml push
@@ -68,15 +68,15 @@
   #       uses: actions/checkout@v4
 
   #     - name: Pull Image from Docker Hub
-  #       shell: pwsh
+  #  
   #       run: docker compose -f docker-compose.yml pull
 
   #     - name: Delete Old Container
-  #       shell: pwsh
+  #  
   #       run: docker rm -f baphomet-server-container
 
   #     - name: Run Docker Container
-  #       shell: pwsh
+  #  
         # run: docker compose -f docker-compose.yml up -d
 
 name: Deploy Baphomet Server
@@ -94,7 +94,6 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set Environment Variables
-        shell: pwsh
         run: |
           echo "ATLAS_DB_PASSWORD=${{ secrets.ATLAS_DB_PASSWORD }}" >> $env:GITHUB_ENV
           echo "ATLAS_DB_USERNAME=${{ secrets.ATLAS_DB_USERNAME }}" >> $env:GITHUB_ENV
@@ -107,20 +106,16 @@ jobs:
           echo "SSL_CERT_INTERMEDIATE=${{ secrets.IONOS_SSL_CERT_INTERMEDIATE }}" >> $env:GITHUB_ENV
 
       - name: Install Docker Compose
-        shell: pwsh
         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
-            echo $installPath >> $env:GITHUB_ENV
-          }
+          if ! docker-compose -v > /dev/null 2>&1; then
+            curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+            chmod +x /usr/local/bin/docker-compose
+          fi
 
       - name: Login to Docker Hub
-        shell: pwsh
         run: docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Build and Push Docker Images
-        shell: pwsh
         run: |
           docker compose -f docker-compose.yml build
           docker compose -f docker-compose.yml push
@@ -129,19 +124,24 @@ jobs:
     needs: build
     runs-on: self-hosted
 
+
     steps:
       - name: Checkout Source
         uses: actions/checkout@v4
 
+      - name: Install Docker Compose (if needed)
+        run: |
+          if ! docker-compose -v > /dev/null 2>&1; then
+            curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+            chmod +x /usr/local/bin/docker-compose
+          fi
+
       - name: Pull Image from Docker Hub
-        shell: pwsh
         run: docker compose -f docker-compose.yml pull
 
       - name: Delete Old Container
-        shell: pwsh
         run: docker rm -f baphomet-server-container
 
       - name: Run Docker Container
-        shell: pwsh
         run: docker compose -f docker-compose.yml up -d