diff --git a/.github/workflows/Dev-CI-CD.yml b/.github/workflows/Dev-CI-CD.yml index 5e226e37..290d9485 100644 --- a/.github/workflows/Dev-CI-CD.yml +++ b/.github/workflows/Dev-CI-CD.yml @@ -79,7 +79,7 @@ jobs: with: host: ${{ secrets.HOST_DEV }} username: ubuntu - key: ${{ secrets.NEW_KEY }} + key: ${{ secrets.NEW_DEV_KEY }} source: ./scripts/deploy-dev.sh target: /home/ubuntu/ @@ -88,7 +88,7 @@ jobs: with: host: ${{ secrets.HOST_DEV }} username: ubuntu - key: ${{ secrets.NEW_KEY }} + key: ${{ secrets.NEW_DEV_KEY }} source: ./docker-compose-dev.yml target: /home/ubuntu/ @@ -97,7 +97,7 @@ jobs: with: host: ${{ secrets.HOST_DEV }} username: ubuntu - key: ${{ secrets.NEW_KEY }} + key: ${{ secrets.NEW_DEV_KEY }} source: firebase-key.json target: /home/ubuntu/ @@ -108,10 +108,10 @@ jobs: with: host: ${{ secrets.HOST_DEV }} username: ubuntu - key: ${{ secrets.NEW_KEY }} + key: ${{ secrets.NEW_DEV_KEY }} envs: GITHUB_SHA script: | - sudo docker login -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_PASSWORD }} - sudo chmod 777 /home/ubuntu/scripts/deploy-dev.sh + docker login -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_PASSWORD }} + chmod 777 /home/ubuntu/scripts/deploy-dev.sh /home/ubuntu/scripts/deploy-dev.sh docker image prune -f diff --git a/.github/workflows/Prod-CI-CD.yaml b/.github/workflows/Prod-CI-CD.yaml index 4545bb02..005b8f9a 100644 --- a/.github/workflows/Prod-CI-CD.yaml +++ b/.github/workflows/Prod-CI-CD.yaml @@ -111,7 +111,7 @@ jobs: key: ${{ secrets.NEW_KEY }} envs: GITHUB_SHA script: | - sudo docker login -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_PASSWORD }} - sudo chmod 777 /home/ubuntu/scripts/deploy-prod.sh + docker login -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_PASSWORD }} + chmod 777 /home/ubuntu/scripts/deploy-prod.sh /home/ubuntu/scripts/deploy-prod.sh docker image prune -f diff --git a/Dockerfile.dev b/Dockerfile.dev index 6de5a5b1..e8184d4b 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,8 +1,8 @@ -FROM amazoncorretto:21-alpine-jdk +FROM eclipse-temurin:21-jdk ARG JAR_FILE=./build/libs/*.jar COPY ${JAR_FILE} server.jar EXPOSE 8080 -ENTRYPOINT ["java", "-Xms256m", "-Xmx512m", "-Dspring.profiles.active=dev", "-jar", "server.jar"] \ No newline at end of file +ENTRYPOINT ["java", "-Xms256m", "-Xmx512m", "-XX:+HeapDumpOnOutOfMemoryError", "-XX:HeapDumpPath=/tmp/heapdump.hprof", "-XX:OnOutOfMemoryError=kill -9 %p", "-Dspring.profiles.active=dev", "-jar", "server.jar"] diff --git a/Dockerfile.prod b/Dockerfile.prod index fa7b6460..6b53677d 100644 --- a/Dockerfile.prod +++ b/Dockerfile.prod @@ -1,9 +1,8 @@ FROM amazoncorretto:21-alpine-jdk ARG JAR_FILE=./build/libs/*.jar - COPY ${JAR_FILE} server.jar EXPOSE 8080 -ENTRYPOINT ["java", "-jar", "-Dspring.profiles.active=prod", "server.jar"] +ENTRYPOINT ["java", "-Xms256m", "-Xmx512m", "-XX:+HeapDumpOnOutOfMemoryError", "-XX:HeapDumpPath=/tmp/heapdump.hprof", "-XX:OnOutOfMemoryError=kill -9 %p", "-Dspring.profiles.active=prod", "-jar", "server.jar"] diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 9e93e40a..a3aa1ab6 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -26,6 +26,7 @@ services: - REDIS_PORT=6379 volumes: - ./firebase-key.json:/src/main/resources/firebase-key.json + - /dump/blue-dev:/tmp depends_on: - redis logging: @@ -51,6 +52,7 @@ services: - REDIS_PORT=6379 volumes: - ./firebase-key.json:/src/main/resources/firebase-key.json + - /dump/green-dev:/tmp depends_on: - redis logging: diff --git a/docker-compose.yml b/docker-compose.yml index 8a6bd31a..5caa2235 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,6 +26,7 @@ services: - REDIS_PORT=6379 volumes: - ./firebase-key.json:/src/main/resources/firebase-key.json + - /dump/blue:/tmp depends_on: - redis logging: @@ -51,6 +52,7 @@ services: - REDIS_PORT=6379 volumes: - ./firebase-key.json:/src/main/resources/firebase-key.json + - /dump/green:/tmp depends_on: - redis logging: diff --git a/scripts/deploy-dev.sh b/scripts/deploy-dev.sh index fbbd5f29..521ac5f5 100644 --- a/scripts/deploy-dev.sh +++ b/scripts/deploy-dev.sh @@ -6,9 +6,9 @@ IS_REDIS_EXIST=$(docker ps | grep redis) if [ -z "$IS_REDIS_EXIST" ];then echo "### REDIS ###" echo ">>> pull redis image" - docker compose pull redis + docker compose pull redis-dev echo ">>> up redis container" - docker compose up -d redis + docker compose up -d redis-dev fi # green up diff --git a/src/main/java/com/projectlyrics/server/global/dev/cron/SongCollector.java b/src/main/java/com/projectlyrics/server/global/dev/cron/SongCollector.java index f07d8371..8dc04177 100644 --- a/src/main/java/com/projectlyrics/server/global/dev/cron/SongCollector.java +++ b/src/main/java/com/projectlyrics/server/global/dev/cron/SongCollector.java @@ -127,7 +127,7 @@ private static List getSongs(Artist artist) { List songs = new ArrayList<>(); AlbumListResponse albumListResponse = null; - log.info("songs of {} is being collected", artist.getName()); + //log.info("songs of {} is being collected", artist.getName()); try { do { response = HttpRequestClient.send(url);