chore : docker-compose.yml를 수정한다

.github/workflows/cd.yml

@@ -65,9 +65,11 @@ jobs:
           port: 22
           script: |
             sudo docker login -u ${{ secrets.DOCKER_ID }} -p ${{ secrets.DOCKER_PASSWORD }}  
+            sudo docker-compose down
             sudo docker pull ${{ secrets.DOCKER_USERNAME }}/server
             sudo docker pull ${{ secrets.DOCKER_USERNAME }}/batch
             sudo chmod +x deploy.sh
-            sudo chmod +x docker-compose.yml
-            sudo ./deploy.sh
+            sudo chmod +x docker-compose.yml        
+            sudo nohup docker-compose up &
+#            sudo ./deploy.sh
             sudo docker image prune -f

deploy.sh

@@ -27,39 +27,43 @@ else
     echo "Docker-compose is already installed"
 fi
 
-RUNNING_CONTAINER=$(docker ps | grep blue)
-NGINX_CONF="/home/ec2-user/data/nginx/app.conf"
+#RUNNING_CONTAINER=$(docker ps | grep blue)
+#NGINX_CONF="/home/ec2-user/data/nginx/app.conf"
 RUNNING_NGINX=$(docker ps | grep nginx)
 BATCH_CONTAINER="batch"
 
-if [ -z "$RUNNING_CONTAINER" ]; then
-    TARGET_SERVICE="blue-api"
-    OTHER_SERVICE="green-api"
-    TARGET_PORT="8082"
-    OTHER_PORT="8081"
-else
-    TARGET_SERVICE="green-api"
-    OTHER_SERVICE="blue-api"
-    TARGET_PORT="8081"
-    OTHER_PORT="8082"
-fi
+#if [ -z "$RUNNING_CONTAINER" ]; then
+#    TARGET_SERVICE="blue-api"
+#    OTHER_SERVICE="green-api"
+#    TARGET_PORT="8082"
+#    OTHER_PORT="8081"
+#else
+#    TARGET_SERVICE="green-api"
+#    OTHER_SERVICE="blue-api"
+#    TARGET_PORT="8081"
+#    OTHER_PORT="8082"
+#fi
 
 
-echo "$TARGET_SERVICE Deploy..."
-docker-compose -f /home/ec2-user/docker-compose.yml up -d $TARGET_SERVICE $BATCH_CONTAINER
+#echo "$TARGET_SERVICE Deploy..."
+#docker-compose -f /home/ec2-user/docker-compose.yml up -d $TARGET_SERVICE $BATCH_CONTAINER
 
 # Wait for the target service to be healthy before proceeding
 sleep 10
 
-if [ -z "$RUNNING_NGINX" ]; then
-    echo "Starting Nginx... Changing port to $TARGET_PORT"
-    docker-compose -f /home/ec2-user/docker-compose.yml up -d nginx
-fi
-
-# Update the nginx config and reload
-sed -i "s/$OTHER_SERVICE/$TARGET_SERVICE/" $NGINX_CONF
-sed -i "s/$OTHER_PORT/$TARGET_PORT/" $NGINX_CONF
-docker-compose -f /home/ec2-user/docker-compose.yml restart nginx
+#if [ -z "$RUNNING_NGINX" ]; then
+#    echo "Starting Nginx... Changing port to $TARGET_PORT"
+#    docker-compose -f /home/ec2-user/docker-compose.yml up -d nginx
+#fi
+#
+## Update the nginx config and reload
+#sed -i "s/$OTHER_SERVICE/$TARGET_SERVICE/" $NGINX_CONF
+#sed -i "s/$OTHER_PORT/$TARGET_PORT/" $NGINX_CONF
+#docker-compose -f /home/ec2-user/docker-compose.yml restart nginx
+#
+## Stop the other service
+#docker-compose -f /home/ec2-user/docker-compose.yml stop $OTHER_SERVICE
 
-# Stop the other service
-docker-compose -f /home/ec2-user/docker-compose.yml stop $OTHER_SERVICE
+# docker-compose down & up
+#nohup docker-compose -f /home/ec2-user/docker-compose.yml down > /dev/null 2>&1 &
+#nohup docker-compose -f /home/ec2-user/docker-compose.yml up -d > /dev/null 2>&1 &

docker-compose.yml

@@ -11,22 +11,22 @@ services:
       - ./data/nginx/log:/var/log/nginx
       - ./data/certbot/conf:/etc/letsencrypt
       - ./data/certbot/www:/var/www/certbot
+    depends_on: server
     command: "/bin/sh -c 'while :; do sleep 6h & wait $${!}; nginx -s reload; done & nginx -g \"daemon off;\"'"
-    restart: "always"
 
-  blue-api:
-    container_name: blue-api
+  server:
+    container_name: server
     image: goodmoneying/server
     ports:
-      - "8082:8080"
+      - "8080:8080"
     restart: "always"
 
-  green-api:
-    container_name: green-api
-    image: goodmoneying/server
-    ports:
-      - "8081:8080"
-    restart: "always"
+#  green-api:
+#    container_name: green-api
+#    image: goodmoneying/server
+#    ports:
+#      - "8081:8080"
+#    restart: "always"
 
   batch:
     container_name: batch