dev (#2)

Co-authored-by: Frank John Begornia <frank.begornia@yahoo.com>
Reviewed-on: #2

.gitea/workflows/deploy.yml

@@ -32,10 +32,6 @@ jobs:
 
       - name: Setup SSH and Deploy
         shell: sh
-        env:
-          DEPLOY_SSH_KEY: ${{ secrets.DEPLOY_SSH_KEY }}
-          DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
-          DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
         run: |
           mkdir -p ~/.ssh
           chmod 700 ~/.ssh
@@ -46,19 +42,21 @@ jobs:
           cd /workspace/repo
           scp -o StrictHostKeyChecking=no -i ~/.ssh/deploy_key merchbay_admin.tar.gz docker-compose.yml "$DEPLOY_USER@$DEPLOY_HOST:/tmp/"
           
-          ssh -o StrictHostKeyChecking=no -i ~/.ssh/deploy_key "$DEPLOY_USER@$DEPLOY_HOST" 'bash -s' << 'ENDSSH'
-          set -e
-          DEPLOY_DIR="/var/www/merchbay_admin"
-          mkdir -p "$DEPLOY_DIR"
+          ssh -o StrictHostKeyChecking=no -i ~/.ssh/deploy_key "$DEPLOY_USER@$DEPLOY_HOST" "
+            DEPLOY_DIR='/var/www/merchbay_admin'
+            mkdir -p \$DEPLOY_DIR
             cd /tmp
             docker load < merchbay_admin.tar.gz
             
-          echo "Removing old merchbay_admin images"
-          CURRENT_IMAGE=$(docker images merchbay_admin:latest -q)
-          docker images | grep merchbay_admin | grep -v "$CURRENT_IMAGE" | awk '{print $3}' | xargs -r docker rmi -f || true
+            echo 'Removing old merchbay_admin images'
+            docker images | grep merchbay_admin | grep -v "\$(docker images merchbay_admin:latest -q)" | awk '{print \$3}' | xargs -r docker rmi -f || true
             
-          cp docker-compose.yml "$DEPLOY_DIR/"
-          cd "$DEPLOY_DIR"
+            cp docker-compose.yml \$DEPLOY_DIR/
+            cd \$DEPLOY_DIR
+            
+            # .env file should already exist on server with all required variables
+            # Required: DB_*, IMAGES_DIRECTORY, PRODUCTION_PRIVATE_SERVER
+            # If it doesn't exist, deployment will fail (this is intentional for security)
             
             docker compose down || true
             docker image prune -f
@@ -72,17 +70,21 @@ jobs:
             docker compose exec -T app php artisan route:cache
             rm -f /tmp/merchbay_admin.tar.gz /tmp/docker-compose.yml
             
-          echo "Aggressive Docker cleanup to reclaim space"
+            echo 'Aggressive Docker cleanup to reclaim space'
             docker image prune -af --filter "until=24h" || true
             docker container prune -f || true
             docker volume prune -f || true
             docker builder prune -af --filter "until=48h" || true
-          echo "Docker space usage:"
+            echo 'Docker space usage:'
             docker system df
             
-          echo "Production deployment completed successfully!"
-          echo "Application available at: https://admin.merchbay.app"
-          ENDSSH
+            echo 'Production deployment completed successfully!'
+            echo 'Application available at: https://admin.merchbay.app'
+          "
+        env:
+          DEPLOY_SSH_KEY: ${{ secrets.DEPLOY_SSH_KEY }}
+          DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
+          DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
 
       - name: Health Check
         shell: sh