Merge pull request #35 from MARU-EGG/docker-compose-refactoring

Docker compose refactoring
MARU-EGG · Jul 3, 2024 · 0c358c9 · 0c358c9
2 parents 02fb69f + 2d3c55a
commit 0c358c9
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 10 deletions.
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches: [ "main", "develop" ]
 
-# 권한 설정
 permissions:
   contents: read
 
@@ -41,6 +40,15 @@ jobs:
           echo "${{ secrets.YML_DEV }}" > ./application-dev.yml
         shell: bash
 
+      # docker compose 파일 생성 - dev
+      - name: make compose-dev.yaml
+        if: contains(github.ref, 'develop')
+        run: |
+          cd ....
+          touch ./compose-dev.yaml
+          echo "${{ secrets.COMPOSE_YML_DEV }}" > ./compose-dev.yaml
+        shell: bash
+
       # Gradle 패키지 캐시
       - name: Cache Gradle packages
         uses: actions/cache@v3
@@ -54,7 +62,7 @@ jobs:
 
       # Spring Boot 애플리케이션 빌드
       - name: Build with Gradle
-        uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1
+        uses: gradle/gradle-build-action@v3
         with:
           arguments: clean bootJar
 
@@ -64,7 +72,7 @@ jobs:
 
       # Docker Hub에 로그인
       - name: Log in to Docker Hub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
@@ -98,14 +106,12 @@ jobs:
 
       # Docker를 통해 EC2로 배포
       - name: Deploy to EC2 dev
-        uses: appleboy/ssh-action@master
+        uses: appleboy/ssh-action@v0.1.0
         if: contains(github.ref, 'develop')
         with:
           host: ${{ secrets.PUBLIC_DNS }}
           username: ${{ secrets.USERNAME }}
           key: ${{ secrets.PEM_KEY }}
           script: |
-            sudo docker ps --filter 'status=exited' -a -q | xargs --no-run-if-empty sudo docker rm
-            sudo docker ps -qa
-            docker rmi $(docker images -q)
-            sudo docker image prune -f
+            docker-compose -f ./compose-dev.yaml pull
+            docker-compose -f ./compose-dev.yaml up -d --build
diff --git a/compose-dev.yaml b/compose-dev.yaml
@@ -0,0 +1,18 @@
+services:
+  maru-egg-app:
+    container_name: maru-egg
+    image: ${DOCKER_REPO}
+    ports:
+      - "8080:8080"
+    links:
+      - maru-egg-db
+    depends_on:
+      - maru-egg-db
+    environment:
+      - SPRING_DATASOURCE_URL=${DB_URL}
+      - SPRING_DATASOURCE_USERNAME=${DB_USERNAME}
+      - SPRING_DATASOURCE_PASSWORD=${DB_PASSWORD}
+    networks:
+      - maru-egg-dev-network
+networks:
+  maru-egg-dev-network:
diff --git a/compose-local.yaml b/compose-local.yaml
@@ -0,0 +1,16 @@
+services:
+  maru-egg-db:
+    image: mysql:8.0
+    platform: linux/x86_64
+    ports:
+      - "3316:3306"
+    environment:
+      MYSQL_ROOT_PASSWORD: maruegg!
+      MYSQL_DATABASE: maru-egg-db
+      MYSQL_USER: maruegg
+      MYSQL_PASSWORD: maruegg!
+      TZ: Asia/Seoul
+    volumes:
+      - ./db/mysql/data:/var/lib/mysql
+      - ./db/mysql/config:/etc/mysql/conf.d
+      - ./db/mysql/init:/docker-entrypoint-initdb.d
diff --git a/src/main/java/mju/iphak/maru_egg/chat/repository/ChatMessageRepositoryImpl.java b/src/main/java/mju/iphak/maru_egg/chat/repository/ChatMessageRepositoryImpl.java
@@ -30,7 +30,7 @@ public Slice<ChatMessageResponse> findAllChatMessages(final Long chatId, final L
 				chatMessage.id.eq(chatId),
 				cursorId != null ? chatMessage.id.lt(cursorId) : null
 			)
-			.orderBy(chatMessage.createAt.desc())
+			.orderBy(chatMessage.createdAt.desc())
 			.limit(pageable.getPageSize() + 1)
 			.fetch();
 

diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml
@@ -13,7 +13,7 @@ spring:
         dialect: org.hibernate.dialect.MySQLDialect
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://localhost:3316/maru-egg-local
+    url: jdbc:mysql://localhost:3316/maru-egg-db
     username: root
     password: maruegg!