Fix bunzip2 issue and simplify image transfer

omarciovsena · May 17, 2024 · b5e5939 · b5e5939
1 parent ebd8450
commit b5e5939
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -19,36 +19,39 @@ jobs:
     - name: Build Docker images
       run: docker-compose build
 
+    - name: List Docker images
+      run: docker images
+
     - name: Set up SSH
       uses: webfactory/ssh-agent@v0.5.3
       with:
         ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
 
     - name: Add DigitalOcean droplet to known_hosts
       run: |
-        ssh-keyscan ${{ secrets.DROPLET_IP }} >> ~/.ssh/known_hosts    
+        ssh-keyscan ${{ secrets.DROPLET_IP }} >> ~/.ssh/known_hosts
 
     - name: Save and transfer API image to DigitalOcean
       run: |
         set -e
-        IMAGE_API_ID=$(docker images -q abibliadigital-api:latest)
+        IMAGE_API_ID=$(docker images -q abibliadigital_api:latest)
         echo "API Image ID: $IMAGE_API_ID"
         if [ -z "$IMAGE_API_ID" ]; then
           echo "API image not found!"
           exit 1
         fi
-        docker save $IMAGE_API_ID | bzip2 | ssh root@${{ secrets.DROPLET_IP }} 'bunzip2 | docker load'
+        docker save $IMAGE_API_ID | bzip2 | ssh root@${{ secrets.DROPLET_IP }} 'bzip2 -d | docker load'
 
     - name: Save and transfer Mongo image to DigitalOcean
       run: |
         set -e
-        IMAGE_MONGO_ID=$(docker images -q abibliadigital-mongo:latest)
+        IMAGE_MONGO_ID=$(docker images -q abibliadigital_mongo:latest)
         echo "Mongo Image ID: $IMAGE_MONGO_ID"
         if [ -z "$IMAGE_MONGO_ID" ]; then
           echo "Mongo image not found!"
           exit 1
         fi
-        docker save $IMAGE_MONGO_ID | bzip2 | ssh root@${{ secrets.DROPLET_IP }} 'bunzip2 | docker load'
+        docker save $IMAGE_MONGO_ID | bzip2 | ssh root@${{ secrets.DROPLET_IP }} 'bzip2 -d | docker load'
 
     - name: Deploy to DigitalOcean
       run: |

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   abibliadigital-api:
     build: ./docker-api
     command: [ "bash", "/usr/src/api/start.sh" ]
-    image: abibliadigital-api:latest
+    image: abibliadigital_api:latest
     ports:
       - "3000:3000"
     expose:
@@ -24,7 +24,7 @@ services:
   abibliadigital-mongo:
     build: ./docker-mongo
     container_name: abibliadigital-mongo
-    image: abibliadigital-mongo:latest
+    image: abibliadigital_mongo:latest
     ports:
       - "27017:27017"
     expose: