chore(server): update deploy action

brunocroh · May 16, 2024 · 36b11bd · 36b11bd
1 parent a8991d2
commit 36b11bd
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -19,10 +19,12 @@ jobs:
 
       - name: Build and push Docker image
         run: |
-          docker build -t ${{ vars.PROJECT }} --build-arg PROJECT=server .
-          docker tag ${{ vars.PROJECT }}:latest ${{ vars.DOCKER_REPO}}:latest
+          docker compose build
+          docker tag brunoroh/bolhadev-chat:latest ${{ vars.DOCKER_REPO}}/bolhadev-chat:latest
+          docker tag brunoroh/bolhadev-nginx:latest ${{ vars.DOCKER_REPO}}/bolhadev-nginx:latest
           docker login -u ${{ vars.DOCKER_USERNAME }} -p ${{secrets.DOCKER_TOKEN}}
-          docker push ${{ vars.DOCKER_REPO}}:latest
+          docker push ${{ vars.DOCKER_REPO}}/bolhadev-chat:latest
+          docker push ${{ vars.DOCKER_REPO}}/bolhadev-nginx:latest
 
       - name: SSH into EC2 instance and deploy
         uses: appleboy/ssh-action@master
@@ -32,7 +34,11 @@ jobs:
           key: ${{ secrets.EC2_SSH_KEY }}
           script: |
             sudo docker image prune
-            sudo docker pull ${{ vars.DOCKER_REPO }}:latest
-            sudo docker stop ${{ vars.PROJECT}} || true
-            sudo docker rm ${{ vars.PROJECT}} || true
-            sudo docker run -d -p 80:4000 -p 4001:4001 --name ${{ vars.PROJECT}} ${{ vars.DOCKER_REPO }}:latest
+            sudo docker pull ${{ vars.DOCKER_REPO }}/bolhadev-chat:latest
+            sudo docker pull ${{ vars.DOCKER_REPO }}/bolhadev-nginx:latest
+            sudo docker stop ${{ vars.PROJECT}}/bolhadev-nginx || true
+            sudo docker stop ${{ vars.PROJECT}}/bolhadev-chat || true
+            sudo docker rm ${{ vars.PROJECT}}/bolhadev-nginx || true
+            sudo docker rm ${{ vars.PROJECT}}/bolhadev-chat || true
+            sudo docker run -d -p 4000:4000 -p 4001:4001 --name bolhadev-chat ${{ vars.DOCKER_REPO }}/bolhadev-chat:latest
+            sudo docker run -d -p 80:80 --name bolhadev-nginx ${{ vars.DOCKER_REPO }}/bolhadev-nginx:latest
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,12 +1,20 @@
+version: "3.8"
+
 services:
   bolhadev-chat:
+    build:
+      context: .
+      dockerfile: Dockerfile
+      args:
+        PROJECT: server
     image: brunoroh/bolhadev-chat:latest
     ports:
       - "4000:4000"
       - "4001:4001"
 
   nginx:
     build: ./docker/nginx/
+    image: brunoroh/bolhadev-nginx:latest
     ports:
       - "80:80"
     depends_on: