From 09ad0c823cfb47c17638d53ddb218fb4ddb9a584 Mon Sep 17 00:00:00 2001 From: kang Date: Sun, 25 Feb 2024 14:03:50 +0900 Subject: [PATCH 01/12] chore: change ai server host url --- .../java/zero/eight/donut/service/SerialDonationService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/zero/eight/donut/service/SerialDonationService.java b/src/main/java/zero/eight/donut/service/SerialDonationService.java index ad80075..80d8658 100644 --- a/src/main/java/zero/eight/donut/service/SerialDonationService.java +++ b/src/main/java/zero/eight/donut/service/SerialDonationService.java @@ -250,7 +250,7 @@ private String uploadImageToGCS(DonateGiftRequestDto requestDto) throws IOExcept } private void sendImageToAI(Long giftId, MultipartFile giftImage){ - WebClient webClient = WebClient.builder().baseUrl("http://127.0.0.1:8000").build(); + WebClient webClient = WebClient.builder().baseUrl("http://34.64.144.108:8000").build(); MultipartBodyBuilder sandImageRequestDto = new MultipartBodyBuilder(); sandImageRequestDto.part("giftId", giftId); log.info("giftId -> {}", giftId); From 381e1d8683104b1fcc4a2ffd2eae564ed394e295 Mon Sep 17 00:00:00 2001 From: kang Date: Tue, 23 Apr 2024 21:39:42 +0900 Subject: [PATCH 02/12] refactor: move folder --- src/main/resources/docker-compose.yml => docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/main/resources/docker-compose.yml => docker-compose.yml (87%) diff --git a/src/main/resources/docker-compose.yml b/docker-compose.yml similarity index 87% rename from src/main/resources/docker-compose.yml rename to docker-compose.yml index ed61bd6..5cd21d7 100644 --- a/src/main/resources/docker-compose.yml +++ b/docker-compose.yml @@ -9,7 +9,7 @@ services: donut: image: donut build: - context: . + context: src/main/java dockerfile: ./Dockerfile ports: - 8080:8080 From 5e2f4457ad73c8fe991ffd8413b39e2beeb8a019 Mon Sep 17 00:00:00 2001 From: kang Date: Tue, 23 Apr 2024 21:39:54 +0900 Subject: [PATCH 03/12] chore: update yml --- src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 1b070dd..9ba0c8d 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,3 +1,3 @@ spring: profiles: - active: prod, redis, gcs \ No newline at end of file + active: prod, db, gcs \ No newline at end of file From 4122bdaaf7e12ad389a55861eee1dcae8224e14c Mon Sep 17 00:00:00 2001 From: kang Date: Tue, 23 Apr 2024 21:40:03 +0900 Subject: [PATCH 04/12] chore: update yml --- Donut-Server-yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Donut-Server-yml b/Donut-Server-yml index 2511658..cabdb1a 160000 --- a/Donut-Server-yml +++ b/Donut-Server-yml @@ -1 +1 @@ -Subproject commit 25116587812b6bec8ff530b87f12be6ac79987cc +Subproject commit cabdb1a9136713e982a1536c5ad63fd753f4bd38 From 8828074b7fa1f89eb2265fb1a2c637f5dda1486f Mon Sep 17 00:00:00 2001 From: kang Date: Tue, 23 Apr 2024 22:52:02 +0900 Subject: [PATCH 05/12] chore: update gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 921c491..ff47af8 100644 --- a/.gitignore +++ b/.gitignore @@ -41,4 +41,3 @@ out/ ### gcs access iam ### *.json -adroit-metric-413519-d4e6d7038d34.json From a130708663c58e2c96e1fb832ca31fae9137b10f Mon Sep 17 00:00:00 2001 From: kang Date: Tue, 23 Apr 2024 23:19:46 +0900 Subject: [PATCH 06/12] chore: add banner --- src/main/resources/banner.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 src/main/resources/banner.txt diff --git a/src/main/resources/banner.txt b/src/main/resources/banner.txt new file mode 100644 index 0000000..b570c04 --- /dev/null +++ b/src/main/resources/banner.txt @@ -0,0 +1,15 @@ + ,----, + ,----.. ,--. ,/ .`| + ,---, / / \ ,--.'| ,` .' : + .' .' `\ / . : ,--,: : | ,--, ; ; / +,---.' \ . / ;. \ ,`--.'`| ' : ,'_ /| .'___,/ ,' +| | .`\ | . ; / ` ; | : : | | .--. | | : | : | +: : | ' | ; | ; \ ; | : | \ | : ,'_ /| : . | ; |.'; ; +| ' ' ; : | : | ; | ' | : ' '; | | ' | | . . `----' | | +' | ; . | . | ' ' ' : ' ' ;. ; | | ' | | | ' : ; +| | : | ' ' ; \; / | | | | \ | : | | : ' ; | | ' +' : | / ; \ \ ', / ' : | ; .' | ; ' | | ' ' : | +| | '` ,/ ; : / | | '`--' : | : ; ; | ; |.' +; : .' \ \ .' ' : | ' : `--' \ '---' +| ,.' `---` ; |.' : , .-./ +'---' '---' `--`----' From 516d4738abf22844a593473bbcb0155579bdb7a1 Mon Sep 17 00:00:00 2001 From: kang Date: Tue, 23 Apr 2024 23:19:57 +0900 Subject: [PATCH 07/12] chore: update yml --- Donut-Server-yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Donut-Server-yml b/Donut-Server-yml index cabdb1a..5bd2b9b 160000 --- a/Donut-Server-yml +++ b/Donut-Server-yml @@ -1 +1 @@ -Subproject commit cabdb1a9136713e982a1536c5ad63fd753f4bd38 +Subproject commit 5bd2b9ba76155b9c3a10e08a00d130b1ed555158 From 9857c2bcb9b96d8fa223d5193a83ffe12bff8ddd Mon Sep 17 00:00:00 2001 From: kang Date: Wed, 24 Apr 2024 00:53:31 +0900 Subject: [PATCH 08/12] chore: delete docker compose --- docker-compose.yml | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 5cd21d7..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,17 +0,0 @@ -version: '3.4' - -services: - redis: - image: redis - ports: - - 6379:6379 - - donut: - image: donut - build: - context: src/main/java - dockerfile: ./Dockerfile - ports: - - 8080:8080 - depends_on: - - redis \ No newline at end of file From bdbb038a3a06dc33332b89f95529bfbea708f90f Mon Sep 17 00:00:00 2001 From: kang Date: Wed, 24 Apr 2024 00:53:38 +0900 Subject: [PATCH 09/12] chore: update yml --- Donut-Server-yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Donut-Server-yml b/Donut-Server-yml index 5bd2b9b..9c58def 160000 --- a/Donut-Server-yml +++ b/Donut-Server-yml @@ -1 +1 @@ -Subproject commit 5bd2b9ba76155b9c3a10e08a00d130b1ed555158 +Subproject commit 9c58def399870d6ed46752ee9dcb7d36c9719e43 From fc9dbcf654db8551dcd46d81c7e01adf5ef27ce8 Mon Sep 17 00:00:00 2001 From: kang Date: Wed, 24 Apr 2024 01:25:13 +0900 Subject: [PATCH 10/12] chore: update ci condition --- .github/workflows/gradle.yml | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index c508cab..b243ce9 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -10,8 +10,6 @@ name: Java CI with Gradle on: push: branches: [ "main" ] - pull_request: - branches: [ "main" ] jobs: build: @@ -68,33 +66,3 @@ jobs: sudo docker pull ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPOSITORY }}:${GITHUB_SHA::7} sudo docker tag ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPOSITORY }}:${GITHUB_SHA::7} donut sudo docker-compose up -d --remove-orphans - - # 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@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0 - # with: - # gradle-version: '8.5' - # - # - name: Build with Gradle 8.5 - # 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@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0 From 55da27c7df91556f34b0c132d32e7bc9f3c08794 Mon Sep 17 00:00:00 2001 From: kang Date: Wed, 24 Apr 2024 01:33:16 +0900 Subject: [PATCH 11/12] chore: update gradle.yml --- .github/workflows/gradle.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index b243ce9..a40240a 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -48,9 +48,9 @@ jobs: - name: Docker build run: | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_PASSWORD }} - docker build -t donut . - docker tag donut kang1221/donut:${GITHUB_SHA::7} - docker push kang1221/donut:${GITHUB_SHA::7} + docker build -t ${{ secrets.DOCKERHUB_REPOSITORY }} . + docker tag ${{ secrets.DOCKERHUB_REPOSITORY }} ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPOSITORY }}:${GITHUB_SHA::7} + docker push ${{ secrets.DOCKERHUB_USERNAME }}/${{ secrets.DOCKERHUB_REPOSITORY }}:${GITHUB_SHA::7} # Deploy From ed1313cb5d0caec78cb6042312f8d118c43a24bf Mon Sep 17 00:00:00 2001 From: kang Date: Wed, 24 Apr 2024 01:33:22 +0900 Subject: [PATCH 12/12] chore: update yml --- Donut-Server-yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Donut-Server-yml b/Donut-Server-yml index 9c58def..2bb3371 160000 --- a/Donut-Server-yml +++ b/Donut-Server-yml @@ -1 +1 @@ -Subproject commit 9c58def399870d6ed46752ee9dcb7d36c9719e43 +Subproject commit 2bb337129d6502c39fde8764219f7344f61f3045