Update digitalocean-deploy.yml

3xjn · Oct 14, 2024 · f088d2f · f088d2f
1 parent 30a7c6f
commit f088d2f
Showing 1 changed file with 23 additions and 23 deletions.
diff --git a/.github/workflows/digitalocean-deploy.yml b/.github/workflows/digitalocean-deploy.yml
@@ -22,36 +22,41 @@ jobs:
           key: "${{ runner.os }}-docker-${{ hashFiles('**/Dockerfile', '**/*.csproj') }}"
           restore-keys: |
             ${{ runner.os }}-docker-
+
       - name: Set up Docker Image Tag
         run: |
           echo "IMAGE_TAG=todoapp:$(date +%s)-${GITHUB_SHA::8}" >> $GITHUB_ENV
+
       - name: Build Docker image
         run: |
           docker build --cache-from=type=local,src=/tmp/.docker-cache -t "${{ env.IMAGE_TAG }}" .
           echo "Docker image built successfully:"
           docker image ls --format "{{.Repository}}:{{.Tag}}" | grep "todoapp" || echo "Warning: Image not found in list, but build completed"
+
       - name: Save Docker image to a tar file
         run: |
           docker save ${{ env.IMAGE_TAG }} -o image.tar
           ls -lh image.tar
+
       - name: Setup SSH
         run: |
           mkdir -p ~/.ssh
           echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
           chmod 600 ~/.ssh/id_rsa
           ssh-keyscan -H ${{ secrets.DROPLET_IP }} >> ~/.ssh/known_hosts
+
       - name: Transfer docker image and docker-compose.yml
         run: |
-          scp -i ~/.ssh/id_rsa image.tar ${{ secrets.DROPLET_USERNAME }}@${{ secrets.DROPLET_IP }}:/home/${{ secrets.DROPLET_USERNAME }}/image.tar
-      - name: Set Environment Variables
-        run: |
-          echo "CERT_PFX=/home/${{ secrets.DROPLET_USERNAME }}/mycert.pfx" >> $GITHUB_ENV
-          echo "CERT_PFX_PASS=$(cat /home/${{ secrets.DROPLET_USERNAME }}/certpass.txt)" >> $GITHUB_ENV
-          echo "MONGO_CONNECTION_STRING=${{ secrets.MONGO_CONNECTION_STRING }}" >> $GITHUB_ENV
-          echo "MONGO_DATABASE_NAME=${{ secrets.MONGO_DATABASE_NAME }}" >> $GITHUB_ENV
-          echo "MONGO_COLLECTION_NAME=${{ secrets.MONGO_COLLECTION_NAME }}" >> $GITHUB_ENV
-          
+          scp -i ~/.ssh/id_rsa image.tar docker-compose.yml ${{ secrets.DROPLET_USERNAME }}@${{ secrets.DROPLET_IP }}:/home/${{ secrets.DROPLET_USERNAME }}/
+
       - name: SSH into Droplet and Deploy using Docker Compose
+        env:
+          IMAGE_TAG: ${{ env.IMAGE_TAG }}
+          CERT_PFX: "/home/${{ secrets.DROPLET_USERNAME }}/mycert.pfx"
+          CERT_PFX_PASS: ${{ secrets.CERT_PFX_PASS }}
+          MONGO_CONNECTION_STRING: ${{ secrets.MONGO_CONNECTION_STRING }}
+          MONGO_DATABASE_NAME: ${{ secrets.MONGO_DATABASE_NAME }}
+          MONGO_COLLECTION_NAME: ${{ secrets.MONGO_COLLECTION_NAME }}
         run: |
           ssh -o ServerAliveInterval=60 -o ServerAliveCountMax=10 -i ~/.ssh/id_rsa ${{ secrets.DROPLET_USERNAME }}@${{ secrets.DROPLET_IP }} << EOF
             set -e
@@ -68,28 +73,23 @@ jobs:
             fi
             
             echo "Loading Docker image..."
-            if [ -f /home/${{ secrets.DROPLET_USERNAME }}/image.tar ]; then
-              sudo docker load -i /home/${{ secrets.DROPLET_USERNAME }}/image.tar
-            else
-              echo "image.tar not found, skipping load step"
-            fi
+            sudo docker load -i image.tar
             
             echo "Loaded Docker images:"
             sudo docker images
             
             echo "Running Docker Compose..."
             export IMAGE_TAG=${{ env.IMAGE_TAG }}
-            # Set environment variables for sensitive data
-            export CERT_PFX="/home/${{ secrets.DROPLET_USERNAME }}/mycert.pfx"
-            export CERT_PFX_PASS="\$CERT_PFX_PASS"
-            export MONGO_CONNECTION_STRING="\$MONGO_CONNECTION_STRING"
-            export MONGO_DATABASE_NAME="\$MONGO_DATABASE_NAME"
-            export MONGO_COLLECTION_NAME="\$MONGO_COLLECTION_NAME"
-            # Run the Docker Compose command with sensitive data
-            sudo docker compose up -d
+            export CERT_PFX=${{ env.CERT_PFX }}
+            export CERT_PFX_PASS='${{ env.CERT_PFX_PASS }}'
+            export MONGO_CONNECTION_STRING='${{ env.MONGO_CONNECTION_STRING }}'
+            export MONGO_DATABASE_NAME='${{ env.MONGO_DATABASE_NAME }}'
+            export MONGO_COLLECTION_NAME='${{ env.MONGO_COLLECTION_NAME }}'
+            
+            sudo -E docker compose up -d
             
             echo "Cleaning up..."
-            rm -f /home/${{ secrets.DROPLET_USERNAME }}/image.tar
+            rm -f image.tar
             
             echo "Deployment completed successfully!"
           EOF