Merge branch 'develop' into fix/search-refactor-isValidDateRange

.github/workflows/development.yml

@@ -28,10 +28,20 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Build, tag, and push docker image
-        run: |
-          docker build --platform linux/amd64 -t ${{ secrets.DOCKER_USERNAME }}/${{env.DOCKERHUB_IMAGE_NAME}}:latest .
-          docker push ${{ secrets.DOCKER_USERNAME }}/${{env.DOCKERHUB_IMAGE_NAME}}:latest
+        uses: docker/build-push-action@v4
+        with:
+          push: true
+          tags: ${{ secrets.DOCKER_USERNAME }}/${{env.DOCKERHUB_IMAGE_NAME}}:latest
 
       - name: Rename docker compose config file
         run: mv docker-compose.ci.yml docker-compose.yml
@@ -43,7 +53,7 @@ jobs:
           key: ${{ secrets.EC2_PRIVATE_KEY }}
           port: ${{ secrets.EC2_PORT }}
           source: 'docker-compose.yml'
-          target: /home/ec2-user
+          target: /home/${{ secrets.EC2_USERNAME }}
 
       - name: Login to EC2 instance
         uses: appleboy/[email protected]

.github/workflows/production.yml

@@ -28,10 +28,20 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Build, tag, and push docker image
-        run: |
-          docker build --platform linux/amd64 -t ${{ secrets.DOCKER_USERNAME }}/${{env.DOCKERHUB_IMAGE_NAME}}:latest .
-          docker push ${{ secrets.DOCKER_USERNAME }}/${{env.DOCKERHUB_IMAGE_NAME}}:latest
+        uses: docker/build-push-action@v4
+        with:
+          push: true
+          tags: ${{ secrets.DOCKER_USERNAME }}/${{env.DOCKERHUB_IMAGE_NAME}}:latest
 
       - name: Rename docker compose config file
         run: mv docker-compose.ci.yml docker-compose.yml
@@ -43,7 +53,7 @@ jobs:
           key: ${{ secrets.EC2_PRIVATE_KEY }}
           port: ${{ secrets.EC2_PORT }}
           source: 'docker-compose.yml'
-          target: /home/ec2-user
+          target: /home/${{ secrets.EC2_USERNAME }}
 
       - name: Login to EC2 instance
         uses: appleboy/[email protected]

docker-compose.ci.yml

@@ -1,4 +1,9 @@
 version: '3.8'
+
+networks:
+  vention-network:
+    name: vention-network
+
 services:
   postgres:
     image: postgres:alpine
@@ -13,6 +18,8 @@ services:
       interval: 5s
       timeout: 5s
       retries: 10
+    networks:
+      - vention-network
     volumes:
       - ./data:/var/lib/postgresql/data
     ports:
@@ -27,6 +34,8 @@ services:
     ports:
       - 3000:3000
       - 5555:5555
+    networks:
+      - vention-network
     depends_on:
       postgres:
         condition: service_healthy