Merge pull request #7 from Central-MakeUs/main

[fix] 배포 방식 변경 및 redis 환경 다시 설정
Central-MakeUs · Jan 7, 2024 · 52ae874 · 52ae874
2 parents db53141 + 5b1834c
commit 52ae874
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -10,8 +10,6 @@ name: Java CI with Gradle
 on:
   push:
     branches: [ "dev" ]
-  pull_request:
-    branches: [ "dev" ]
 
 permissions:
   contents: read
@@ -54,8 +52,8 @@ jobs:
             sudo touch .env
             echo "${{ secrets.ENV }}" | sudo tee .env > /dev/null
             
+            docker pull ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_DEV_REPO }}:latest
             docker stop $(docker ps -a -q)
             docker rm $(docker ps -a -q)
-            docker pull ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_DEV_REPO }}:latest
             docker-compose -f ~/Youngduck-Server/docker-compose.dev.yml --env-file ~/Youngduck-Server/.env up --build -d
             docker image prune -a -f
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -1,24 +1,26 @@
 version: '3.7'
 
 services:
+  redis:
+    image: redis
+    container_name: redis
+    ports:
+      - "6379:6379"
+    restart: always
+
   server:
     image: bee1162/popcornmate-dev:latest
     container_name: server
     hostname: server
+    depends_on:
+      - redis
     env_file:
       - .env
     environment:
       - TZ=Asia/Seoul
     expose:
       - 8080
 
-  redis:
-    image: redis
-    container_name: redis
-    hostname: localhost
-    ports:
-      - "6379:6379"
-
   nginx:
     depends_on:
       - server