Merge pull request #81 from Itstime-replog/feature/#72

Fix: app컨테이너 실행 안됨 오류
Itstime-replog · Jan 15, 2025 · a29d089 · a29d089
2 parents c369858 + bfef9ce
commit a29d089
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
@@ -47,7 +47,7 @@ jobs:
         run: docker network create app-network
 
       - name: Docker build and push
-        run: docker build -t yeoljeongping/reflogdocker .
+        run: docker build --no-cache -t yeoljeongping/reflogdocker .
 
       - name: docker login
         uses: docker/login-action@v2
@@ -86,6 +86,7 @@ jobs:
             echo "MAIL_USERNAME=${{ secrets.MAIL_USERNAME }}" >> ~/deploy/.env
             echo "MAIL_PASSWORD=${{ secrets.MAIL_PASSWORD }}" >> ~/deploy/.env
             
-            sudo docker-compose -f ~/deploy/docker-compose.yml pull
-            sudo docker-compose -f ~/deploy/docker-compose.yml up -d
+            sudo docker-compose -f ~/deploy/docker-compose.yml down
+            sudo docker-compose -f ~/deploy/docker-compose.yml pull --ignore-pull-failures
+            sudo docker-compose -f ~/deploy/docker-compose.yml up -d --force-recreate
             sudo docker image prune -f
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,6 +3,7 @@ version: '3.8'
 services:
   app:
     image: yeoljeongping/reflogdocker
+    pull_policy: always
     ports:
       - "8080:8080"
     environment:
@@ -28,16 +29,23 @@ services:
       SPRING_REDIS_HOST: redis
       SPRING_REDIS_PORT: 6379
     depends_on:
-      - redis
+      redis:
+          condition: service_healthy
     networks:
       - app-network
+    restart: always
 
   redis:
     image: "redis:latest"
     ports:
       - "6379:6379"
     networks:
       - app-network
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
 
   nginx:
     image: nginx:latest
@@ -54,6 +62,7 @@ services:
       - certbot
     networks:
       - app-network
+    restart: always
 
   certbot:
     image: certbot/certbot
@@ -63,6 +72,7 @@ services:
       - ./nginx/certbot/www:/var/www/certbot
     networks:
       - app-network
+    restart: always
 
 networks:
   app-network:

diff --git a/src/main/java/itstime/reflog/config/SwaggerConfig.java b/src/main/java/itstime/reflog/config/SwaggerConfig.java
@@ -32,7 +32,7 @@ public OpenAPI SwaggerAPI() {
     private Info apiInfo() {
         return new Info()
                 .title("Reflog Swagger")
-                .description("Reflog Server API 명세서")
+                .description("Reflog Server API 명세서입니다.")
                 .version("1.0.0");
     }
 }