diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d74aff4..d3e338a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -77,7 +77,7 @@ jobs: # 2. 릴리스 : main/develop 브랜치로 Push될 때만 실행 makeTagAndRelease: name: Create Tag and Release - if: github.event_name == 'push' + # if: github.event_name == 'push' needs: backend-ci runs-on: ubuntu-latest permissions: @@ -107,7 +107,7 @@ jobs: # 3. 빌드 및 배포: main/develop 브랜치로 Push될 때만 실행 buildImageAndPush: name: 도커 이미지 빌드와 푸시 - if: github.event_name == 'push' + # if: github.event_name == 'push' needs: makeTagAndRelease runs-on: ubuntu-latest steps: @@ -149,4 +149,4 @@ jobs: no-cache: true tags: | ghcr.io/${{ env.OWNER_LC }}/catch-course:${{ needs.makeTagAndRelease.outputs.tag_name }} - ghcr.io/${{ env.OWNER_LC }}/catch-course:latest + ghcr.io/${{ env.OWNER_LC }}/catch-course:latest \ No newline at end of file diff --git a/backend/Dockerfile b/backend/Dockerfile index ff298d7..a74b2a6 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -25,4 +25,4 @@ COPY --from=builder /app/build/libs/*-SNAPSHOT.jar app.jar # 8080 포트를 외부에 노출 EXPOSE 8080 # "java -jar app.jar" 명령어로 Spring Boot 애플리케이션을 실행 -ENTRYPOINT ["java", "-jar", "app.jar"] +ENTRYPOINT ["java", "-jar", "app.jar"] \ No newline at end of file diff --git a/backend/docker-compose-prod.yml b/backend/docker-compose-prod.yml index 127e43c..dcf939e 100644 --- a/backend/docker-compose-prod.yml +++ b/backend/docker-compose-prod.yml @@ -1,4 +1,22 @@ services: + # Spring Boot 애플리케이션 서비스 추가 + app-prod: + image: ghcr.io/wonseokyoon/catch-course:latest + container_name: app-prod + restart: always + depends_on: + - mysql-db-prod + - redis-prod + - kafka-prod + ports: + - "8080:8080" + networks: + - prod-network + environment: + - SPRING_PROFILES_ACTIVE=prod + - DB_USERNAME=${DB_USERNAME} + - DB_PASSWORD=${DB_PASSWORD} + mysql-db-prod: image: mysql:8.0 container_name: mysql-db-prod @@ -71,4 +89,4 @@ networks: driver: bridge volumes: - mysql_prod_data: + mysql_prod_data: \ No newline at end of file