From 7ed41c28d6139111240c9ddd0b04ea6ac5134b26 Mon Sep 17 00:00:00 2001 From: FhRh Date: Mon, 23 Sep 2024 05:52:08 +0900 Subject: [PATCH 01/18] =?UTF-8?q?deploy=20:=20CD=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Server/banchango/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/banchango/src/main/resources/application.properties b/Server/banchango/src/main/resources/application.properties index eec36e7..ddd2312 100644 --- a/Server/banchango/src/main/resources/application.properties +++ b/Server/banchango/src/main/resources/application.properties @@ -4,4 +4,4 @@ spring.profiles.active=prod app.cors.allowedOrigins=http://localhost:3000,http://localhost:8080 app.oauth2.authorizedRedirectUris=http://localhost:3000/oauth2/redirect,myandroidapp://oauth2/redirect,myiosapp://oauth2/redirect - +# From ed223957c098993aedf1e4849602973edc8bc745 Mon Sep 17 00:00:00 2001 From: FhRh Date: Mon, 23 Sep 2024 06:13:34 +0900 Subject: [PATCH 02/18] =?UTF-8?q?deploy=20:=20Dockerfile=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Server/banchango/Dockerfile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 Server/banchango/Dockerfile diff --git a/Server/banchango/Dockerfile b/Server/banchango/Dockerfile new file mode 100644 index 0000000..1bc11b4 --- /dev/null +++ b/Server/banchango/Dockerfile @@ -0,0 +1,15 @@ +#경량 리눅스 배포판, 도커 이미지 크기를 줄이는데 유용함 +FROM openjdk:17-alpine + +#도커 이미지 내의 작업 디렉토리 정의 +WORKDIR /banchango/ + +#빌드 인자 기본값 정의 +ARG JAR_FILE=/build/libs/banchango-0.0.1-SNAPSHOT.jar + +#호스트 시스템에서 빌드된 Jar파일을 도커 이미지 내부로 옮김 +COPY ${JAR_FILE} /banchango.jar + +#컨테이너 실행 명령어 +#ex) java -jar -Dspring.profiles.active=prod /sejongmate.jar +ENTRYPOINT ["java","-jar","/banchango.jar"] \ No newline at end of file From e8ee86b458960ef629fecf614bae94cba58304b5 Mon Sep 17 00:00:00 2001 From: Due_it <48638700+FhRh@users.noreply.github.com> Date: Mon, 23 Sep 2024 06:16:20 +0900 Subject: [PATCH 03/18] Update gradle.yml --- .github/workflows/gradle.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index e6c81ab..190f2d8 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -34,7 +34,10 @@ jobs: # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md - name: Setup Gradle uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0 - + + - name: move to project + run: cd Server/banchango/ + - name: Grant execute permission for gradlew run: chmod +x gradlew From 4e3c1e06c6d8d9b085bbee5100832f86b2d68b05 Mon Sep 17 00:00:00 2001 From: FhRh Date: Mon, 23 Sep 2024 06:16:57 +0900 Subject: [PATCH 04/18] =?UTF-8?q?deploy=20:=20CD=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Server/banchango/Dockerfile | 3 ++- Server/banchango/src/main/resources/application.properties | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Server/banchango/Dockerfile b/Server/banchango/Dockerfile index 1bc11b4..4596b2b 100644 --- a/Server/banchango/Dockerfile +++ b/Server/banchango/Dockerfile @@ -12,4 +12,5 @@ COPY ${JAR_FILE} /banchango.jar #컨테이너 실행 명령어 #ex) java -jar -Dspring.profiles.active=prod /sejongmate.jar -ENTRYPOINT ["java","-jar","/banchango.jar"] \ No newline at end of file +ENTRYPOINT ["java","-jar","/banchango.jar"] +# diff --git a/Server/banchango/src/main/resources/application.properties b/Server/banchango/src/main/resources/application.properties index ddd2312..d6711d0 100644 --- a/Server/banchango/src/main/resources/application.properties +++ b/Server/banchango/src/main/resources/application.properties @@ -4,4 +4,3 @@ spring.profiles.active=prod app.cors.allowedOrigins=http://localhost:3000,http://localhost:8080 app.oauth2.authorizedRedirectUris=http://localhost:3000/oauth2/redirect,myandroidapp://oauth2/redirect,myiosapp://oauth2/redirect -# From 9bdb56a623e086b8f19206a57e37ad9b32a17036 Mon Sep 17 00:00:00 2001 From: Due_it <48638700+FhRh@users.noreply.github.com> Date: Mon, 23 Sep 2024 06:21:17 +0900 Subject: [PATCH 05/18] Update gradle.yml --- .github/workflows/gradle.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 190f2d8..1d68340 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -33,16 +33,13 @@ jobs: # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies. # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md - name: Setup Gradle - uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0 - - - name: move to project - run: cd Server/banchango/ + uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0 - name: Grant execute permission for gradlew - run: chmod +x gradlew + run: chmod +x ./Server/banchango/gradlew - name: Build with Gradle - run: ./gradlew clean build -x test + run: ./Server/banchango/gradlew clean build -x test - name: Docker build run: | From b505ddc40f3bcf115d6eba7d277983a34bedf6ac Mon Sep 17 00:00:00 2001 From: FhRh Date: Mon, 23 Sep 2024 06:21:41 +0900 Subject: [PATCH 06/18] =?UTF-8?q?deploy=20:=20CD=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Server/banchango/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/banchango/Dockerfile b/Server/banchango/Dockerfile index 4596b2b..ac7492f 100644 --- a/Server/banchango/Dockerfile +++ b/Server/banchango/Dockerfile @@ -13,4 +13,4 @@ COPY ${JAR_FILE} /banchango.jar #컨테이너 실행 명령어 #ex) java -jar -Dspring.profiles.active=prod /sejongmate.jar ENTRYPOINT ["java","-jar","/banchango.jar"] -# + From ca94b135d9080d1486b2b75e025bc42d53db368e Mon Sep 17 00:00:00 2001 From: Due_it <48638700+FhRh@users.noreply.github.com> Date: Mon, 23 Sep 2024 06:25:06 +0900 Subject: [PATCH 07/18] Update gradle.yml --- .github/workflows/gradle.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 1d68340..f5db1dc 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -39,7 +39,9 @@ jobs: run: chmod +x ./Server/banchango/gradlew - name: Build with Gradle - run: ./Server/banchango/gradlew clean build -x test + run: | + cd Server/banchango + ./gradlew clean build -x test - name: Docker build run: | From a87ba3abf39de46adc16ade8af11bd94f0766de8 Mon Sep 17 00:00:00 2001 From: FhRh Date: Mon, 23 Sep 2024 06:25:22 +0900 Subject: [PATCH 08/18] =?UTF-8?q?deploy=20:=20CD=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Server/banchango/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/banchango/Dockerfile b/Server/banchango/Dockerfile index ac7492f..4596b2b 100644 --- a/Server/banchango/Dockerfile +++ b/Server/banchango/Dockerfile @@ -13,4 +13,4 @@ COPY ${JAR_FILE} /banchango.jar #컨테이너 실행 명령어 #ex) java -jar -Dspring.profiles.active=prod /sejongmate.jar ENTRYPOINT ["java","-jar","/banchango.jar"] - +# From 8c3ae464ae7d1981da5bb587af1b2487b80781a1 Mon Sep 17 00:00:00 2001 From: Due_it <48638700+FhRh@users.noreply.github.com> Date: Mon, 23 Sep 2024 06:28:38 +0900 Subject: [PATCH 09/18] Update gradle.yml --- .github/workflows/gradle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index f5db1dc..2e385fc 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -45,6 +45,7 @@ jobs: - name: Docker build run: | + cd Server/banchango docker login -u ${{ secrets.SERVER_DOCKER_USERNAME }} -p ${{ secrets.SERVER_DOCKER_PASSWORD }} docker build -t app . docker tag app ${{ secrets.SERVER_DOCKER_USERNAME }}/banchango:latest From e272d86b36708fc41e4816f00ea3d522dafada34 Mon Sep 17 00:00:00 2001 From: FhRh Date: Mon, 23 Sep 2024 06:29:05 +0900 Subject: [PATCH 10/18] =?UTF-8?q?deploy=20:=20CD=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Server/banchango/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/banchango/Dockerfile b/Server/banchango/Dockerfile index 4596b2b..ac7492f 100644 --- a/Server/banchango/Dockerfile +++ b/Server/banchango/Dockerfile @@ -13,4 +13,4 @@ COPY ${JAR_FILE} /banchango.jar #컨테이너 실행 명령어 #ex) java -jar -Dspring.profiles.active=prod /sejongmate.jar ENTRYPOINT ["java","-jar","/banchango.jar"] -# + From d897b650f07d3885f615598de8a91f7e17f45553 Mon Sep 17 00:00:00 2001 From: Due_it <48638700+FhRh@users.noreply.github.com> Date: Mon, 23 Sep 2024 06:34:09 +0900 Subject: [PATCH 11/18] Update gradle.yml --- .github/workflows/gradle.yml | 39 ------------------------------------ 1 file changed, 39 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 2e385fc..0daf7f3 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -1,10 +1,3 @@ -# This workflow uses actions that are not certified by GitHub. -# They are provided by a third-party and are governed by -# separate terms of service, privacy policy, and support -# documentation. -# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time -# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle - name: Java CD with Gradle on: @@ -30,8 +23,6 @@ jobs: java-version: '17' distribution: 'temurin' - # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies. - # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md - name: Setup Gradle uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0 @@ -64,33 +55,3 @@ jobs: docker run -d --log-driver=syslog -p 8080:8080 ${{ secrets.SERVER_DOCKER_USERNAME }}/bnchango:latest docker rm $(docker ps --filter 'status=exited' -a -q) docker image prune -a -f - - # NOTE: The Gradle Wrapper is the default and recommended way to run Gradle (https://docs.gradle.org/current/userguide/gradle_wrapper.html). - # If your project does not have the Gradle Wrapper configured, you can use the following configuration to run Gradle with a specified version. - # - # - name: Setup Gradle - # uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0 - # with: - # gradle-version: '8.9' - # - # - name: Build with Gradle 8.9 - # run: gradle build - - dependency-submission: - - runs-on: ubuntu-latest - permissions: - contents: write - - steps: - - uses: actions/checkout@v4 - - name: Set up JDK 17 - uses: actions/setup-java@v4 - with: - java-version: '17' - distribution: 'temurin' - - # Generates and submits a dependency graph, enabling Dependabot Alerts for all project dependencies. - # See: https://github.com/gradle/actions/blob/main/dependency-submission/README.md - - name: Generate and submit dependency graph - uses: gradle/actions/dependency-submission@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0 From 26829cd1560f3dede37e3b671bd95e2d2570e532 Mon Sep 17 00:00:00 2001 From: FhRh Date: Mon, 23 Sep 2024 06:35:33 +0900 Subject: [PATCH 12/18] =?UTF-8?q?deploy=20:=20CD=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Server/banchango/Dockerfile | 1 - .../sundaegukbap/banchango/common/HealthCheckController.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Server/banchango/Dockerfile b/Server/banchango/Dockerfile index ac7492f..bad2041 100644 --- a/Server/banchango/Dockerfile +++ b/Server/banchango/Dockerfile @@ -13,4 +13,3 @@ COPY ${JAR_FILE} /banchango.jar #컨테이너 실행 명령어 #ex) java -jar -Dspring.profiles.active=prod /sejongmate.jar ENTRYPOINT ["java","-jar","/banchango.jar"] - diff --git a/Server/banchango/src/main/java/com/sundaegukbap/banchango/common/HealthCheckController.java b/Server/banchango/src/main/java/com/sundaegukbap/banchango/common/HealthCheckController.java index baba1ee..50c524b 100644 --- a/Server/banchango/src/main/java/com/sundaegukbap/banchango/common/HealthCheckController.java +++ b/Server/banchango/src/main/java/com/sundaegukbap/banchango/common/HealthCheckController.java @@ -14,6 +14,6 @@ public class HealthCheckController { @GetMapping @Operation(summary = "health-check") public ResponseEntity healthCheck() { - return ResponseEntity.ok("OK"); + return ResponseEntity.ok("GOOD"); } } From 16dd3c73aa1c2535373cc1f2d20158001fac5555 Mon Sep 17 00:00:00 2001 From: FhRh Date: Mon, 23 Sep 2024 07:01:02 +0900 Subject: [PATCH 13/18] =?UTF-8?q?deploy=20:=20CD=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Server/banchango/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Server/banchango/Dockerfile b/Server/banchango/Dockerfile index bad2041..4596b2b 100644 --- a/Server/banchango/Dockerfile +++ b/Server/banchango/Dockerfile @@ -13,3 +13,4 @@ COPY ${JAR_FILE} /banchango.jar #컨테이너 실행 명령어 #ex) java -jar -Dspring.profiles.active=prod /sejongmate.jar ENTRYPOINT ["java","-jar","/banchango.jar"] +# From 0677ac68892d604215f5c0ab5a6c2cdfed95a2e9 Mon Sep 17 00:00:00 2001 From: Due_it <48638700+FhRh@users.noreply.github.com> Date: Mon, 23 Sep 2024 07:32:52 +0900 Subject: [PATCH 14/18] Update gradle.yml --- .github/workflows/gradle.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 0daf7f3..d0e0c2a 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -25,6 +25,12 @@ jobs: - name: Setup Gradle uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0 + + - name: make application-prod.yml + run: | + cd ./Server/banchango/src/main/resources + touch ./application-prod.properties + echo "${{ secrets.APPLICATION_PROD }}" > ./application-prod.properties - name: Grant execute permission for gradlew run: chmod +x ./Server/banchango/gradlew From dabaca059d5a9a01bec309f214174480605d950e Mon Sep 17 00:00:00 2001 From: FhRh Date: Mon, 23 Sep 2024 07:35:51 +0900 Subject: [PATCH 15/18] =?UTF-8?q?deploy=20:=20CD=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-prod.properties | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 Server/banchango/src/main/resources/application-prod.properties diff --git a/Server/banchango/src/main/resources/application-prod.properties b/Server/banchango/src/main/resources/application-prod.properties deleted file mode 100644 index d0ce600..0000000 --- a/Server/banchango/src/main/resources/application-prod.properties +++ /dev/null @@ -1,12 +0,0 @@ -spring.datasource.url=${MARIADB_URL} -spring.datasource.username=${USER_NAME} -spring.datasource.password=${USER_PASS} -spring.datasource.driver-class-name=org.mariadb.jdbc.Driver - -spring.jpa.show-sql=true -spring.jpa.hibernate.ddl-auto=update - -# spring boot 2.5.x to use script -spring.sql.init.mode=never -# script use after hibernate initilalization -spring.jpa.defer-datasource-initialization=false From 65524494a3a01bd835f8abec6dec7c7b022c8a11 Mon Sep 17 00:00:00 2001 From: FhRh Date: Mon, 23 Sep 2024 07:42:31 +0900 Subject: [PATCH 16/18] =?UTF-8?q?deploy=20:=20CD=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sundaegukbap/banchango/common/HealthCheckController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/banchango/src/main/java/com/sundaegukbap/banchango/common/HealthCheckController.java b/Server/banchango/src/main/java/com/sundaegukbap/banchango/common/HealthCheckController.java index 50c524b..baba1ee 100644 --- a/Server/banchango/src/main/java/com/sundaegukbap/banchango/common/HealthCheckController.java +++ b/Server/banchango/src/main/java/com/sundaegukbap/banchango/common/HealthCheckController.java @@ -14,6 +14,6 @@ public class HealthCheckController { @GetMapping @Operation(summary = "health-check") public ResponseEntity healthCheck() { - return ResponseEntity.ok("GOOD"); + return ResponseEntity.ok("OK"); } } From 64665a3d697792c30650a18022600063bebd1d05 Mon Sep 17 00:00:00 2001 From: Due_it <48638700+FhRh@users.noreply.github.com> Date: Mon, 23 Sep 2024 07:42:57 +0900 Subject: [PATCH 17/18] Update gradle.yml --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index d0e0c2a..b05ad6c 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -58,6 +58,6 @@ jobs: script: | docker pull ${{ secrets.SERVER_DOCKER_USERNAME }}/banchango:latest docker stop $(docker ps -a -q) - docker run -d --log-driver=syslog -p 8080:8080 ${{ secrets.SERVER_DOCKER_USERNAME }}/bnchango:latest + docker run -d --log-driver=syslog -p 8080:8080 ${{ secrets.SERVER_DOCKER_USERNAME }}/banchango:latest docker rm $(docker ps --filter 'status=exited' -a -q) docker image prune -a -f From 103a947f5574d2fa1f4cba598fbccddb80f7b6fc Mon Sep 17 00:00:00 2001 From: FhRh Date: Mon, 23 Sep 2024 07:43:14 +0900 Subject: [PATCH 18/18] =?UTF-8?q?deploy=20:=20CD=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sundaegukbap/banchango/common/HealthCheckController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/banchango/src/main/java/com/sundaegukbap/banchango/common/HealthCheckController.java b/Server/banchango/src/main/java/com/sundaegukbap/banchango/common/HealthCheckController.java index baba1ee..2356eca 100644 --- a/Server/banchango/src/main/java/com/sundaegukbap/banchango/common/HealthCheckController.java +++ b/Server/banchango/src/main/java/com/sundaegukbap/banchango/common/HealthCheckController.java @@ -14,6 +14,6 @@ public class HealthCheckController { @GetMapping @Operation(summary = "health-check") public ResponseEntity healthCheck() { - return ResponseEntity.ok("OK"); + return ResponseEntity.ok("Wellcome"); } }