Merge pull request #48 from KU-Taverse/fix/deploy

fix: deploy
KU-Taverse · Sep 7, 2024 · a7572cf · a7572cf
2 parents 4c1ce20 + 36243e9
commit a7572cf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 17 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -88,7 +88,7 @@ jobs:
             sudo docker-compose stop
             
             sudo docker rm $(sudo docker ps -a -q)
-            sudo docker rmi ${{ secrets.DOCKER_REPO }}
+            sudo docker rmi ${{ sudo docker images -q }}
             sudo docker pull ${{ secrets.DOCKER_REPO }}
             
             sudo docker-compose up --build -d

diff --git a/infra/docker/docker-compose.yml b/infra/docker/docker-compose.yml
@@ -16,6 +16,7 @@ services:
       - mysql-data:/var/lib/mysql
 
   springbootapp:
+    restart: on-failure
     image: ji0513ji/game-server:latest
 #    build:
 #      context: .
@@ -26,7 +27,9 @@ services:
       - redis
       - mysql
     environment:
-      - SPRING_PROFILES_ACTIVE=prodDB
+      SPRING_PROFILES_ACTIVE: prodDB
+      SPRING_DATA_MONGODB_URI: ${MONGODB_URL}
+      SPRING_R2DBC_PASSWORD: 12345678
 
 volumes:
   mysql-data:
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -19,24 +19,10 @@ spring:
   config:
     activate:
       on-profile: "localDB"
-  data:
-    redis:
-      host: localhost
-      port: 6379
-      password:
-      timeout: 5000
-
 
 ---
 
 spring:
   config:
     activate:
-      on-profile: "prodDB"
-
-  data:
-    redis:
-      host: redis
-      port: 6379
-      password:
-      timeout: 5000
+      on-profile: "prodDB"