script: 도커 컴포즈 추가

H-Hive · Jan 15, 2024 · d50eaed · d50eaed
1 parent a359d5c
commit d50eaed
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -49,12 +49,7 @@ jobs:
           key: ${{ secrets.AWS_SSH_KEY }}
           port: 22
           script: |
-              if docker ps -a --format '{{.ID}}' | grep -q .; then
-                sudo docker rm -f $(docker ps -qa)
-              else
-                echo "No Docker containers to remove."
-              fi
-              sudo docker pull ${{ secrets.DOCKERHUB_USERNAME }}/hhive
-              sudo docker run --name hhive -d ${{ secrets.DOCKERHUB_USERNAME }}/hhive
-              sudo docker run --name redis-server -d -p 6379:6379 redis
-              docker image prune -f
+            docker rm -f $(docker ps -qa)
+            docker rmi ${{ secrets.DOCKERHUB_USERNAME }}
+            docker pull ${{ secrets.DOCKERHUB_USERNAME }}
+            docker-compose up -d
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -17,8 +17,22 @@ services:
       - --collation-server=utf8mb4_unicode_ci
     restart: always
 
+  spring-app:
+    build:
+      context: ./spring-app
+      dockerfile: Dockerfile
+    ports:
+      - "8080:8080"
+    depends_on:
+      - mysql-db
+    restart: always
 
-
+  redis:
+    image: redis:latest
+    container_name: redis-server
+    ports:
+      - "6379:6379"
+    restart: always