From 8f2dcf43140852620bf10b07e294b8423eda824d Mon Sep 17 00:00:00 2001 From: Choo Date: Mon, 6 Mar 2023 03:30:16 +0900 Subject: [PATCH 01/12] =?UTF-8?q?Feat:=20=EB=B2=84=ED=82=B7=20=EC=9D=B4?= =?UTF-8?q?=EB=A6=84=20=ED=99=98=EA=B2=BD=20=EB=B3=80=EC=88=98=EB=A1=9C=20?= =?UTF-8?q?=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/sptp/backend/aws/service/AwsService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/sptp/backend/aws/service/AwsService.java b/src/main/java/com/sptp/backend/aws/service/AwsService.java index ef362bb7..103ceaf7 100644 --- a/src/main/java/com/sptp/backend/aws/service/AwsService.java +++ b/src/main/java/com/sptp/backend/aws/service/AwsService.java @@ -4,8 +4,8 @@ import com.amazonaws.services.s3.model.CannedAccessControlList; import com.amazonaws.services.s3.model.ObjectMetadata; import com.amazonaws.services.s3.model.PutObjectRequest; -import com.amazonaws.services.s3.model.S3Object; import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -19,7 +19,8 @@ public class AwsService { private final AmazonS3Client amazonS3Client; - private final String S3Bucket = "atties-bucket"; + @Value("${aws.storage.name}") + private String S3Bucket; // develop "atties-dev-storage", main "atties-bucket" public void uploadImage(MultipartFile image, String uuid) throws IOException { From e071c554cd4d9d7a1cdf37c5e12624062f47c520 Mon Sep 17 00:00:00 2001 From: Choo Date: Mon, 6 Mar 2023 05:06:00 +0900 Subject: [PATCH 02/12] =?UTF-8?q?Feat:=20github=20actions=20=EB=82=B4=20en?= =?UTF-8?q?v=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/develop.yml | 2 +- src/main/resources/application.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index dbcc1ad1..12201275 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -30,7 +30,7 @@ jobs: run: | cd ./src/main/resources touch ./env.properties - echo "${{ secrets.ENV }}" > ./env.properties + echo "${{ secrets.ENV_DEVELOP }}" > ./env.properties shell: bash # Gradle build (Test 제외) - name: Build with Gradle diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index f2f45f79..e0791482 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,6 +1,8 @@ # 배포시 80포트 설정 server: port: 80 +#server: +# port: 8080 spring: From 874abb91af7e5a4594d501bb22a5d93f90cea78b Mon Sep 17 00:00:00 2001 From: Choo Date: Tue, 7 Mar 2023 20:00:11 +0900 Subject: [PATCH 03/12] =?UTF-8?q?build:=20CI=20=EA=B5=AC=EC=B6=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/develop.yml | 43 +++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index 12201275..da4d37f4 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -2,7 +2,10 @@ name: Develop on: push: - branches: [ "main" ] + branches: [ "develop" ] + pull_request: + branches: [ "develop" ] + permissions: contents: read @@ -37,22 +40,22 @@ jobs: uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 with: arguments: clean build -x test - # Docker build - - name: Docker build - run: | - docker login -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_PASSWORD }} - docker build -t atties_spring . - docker tag atties_spring choo000407/atties_spring:${GITHUB_SHA::7} - docker push choo000407/atties_spring:${GITHUB_SHA::7} - # Deploy - - name: Deploy - uses: appleboy/ssh-action@master - with: - host: ec2-44-193-163-114.compute-1.amazonaws.com - username: ec2-user - password: ${{ secrets.SSH_PASSWORD }} - envs: GITHUB_SHA - script: | - docker pull choo000407/atties_spring:${GITHUB_SHA::7} - docker tag choo000407/atties_spring:${GITHUB_SHA::7} atties_spring - docker-compose up -d +# # Docker build +# - name: Docker build +# run: | +# docker login -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_PASSWORD }} +# docker build -t atties_spring . +# docker tag atties_spring choo000407/atties_spring:${GITHUB_SHA::7} +# docker push choo000407/atties_spring:${GITHUB_SHA::7} +# # Deploy +# - name: Deploy +# uses: appleboy/ssh-action@master +# with: +# host: ec2-44-193-163-114.compute-1.amazonaws.com +# username: ec2-user +# password: ${{ secrets.SSH_PASSWORD }} +# envs: GITHUB_SHA +# script: | +# docker pull choo000407/atties_spring:${GITHUB_SHA::7} +# docker tag choo000407/atties_spring:${GITHUB_SHA::7} atties_spring +# docker-compose up -d From 77950b3c873e4a465348bd1aaea14605e80b3b31 Mon Sep 17 00:00:00 2001 From: Choo Date: Thu, 9 Mar 2023 02:09:12 +0900 Subject: [PATCH 04/12] =?UTF-8?q?build:=20CD=20=EA=B5=AC=EC=B6=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/develop.yml | 38 +++++++++++++++++------------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index da4d37f4..f840c3ff 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -40,22 +40,22 @@ jobs: uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1 with: arguments: clean build -x test -# # Docker build -# - name: Docker build -# run: | -# docker login -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_PASSWORD }} -# docker build -t atties_spring . -# docker tag atties_spring choo000407/atties_spring:${GITHUB_SHA::7} -# docker push choo000407/atties_spring:${GITHUB_SHA::7} -# # Deploy -# - name: Deploy -# uses: appleboy/ssh-action@master -# with: -# host: ec2-44-193-163-114.compute-1.amazonaws.com -# username: ec2-user -# password: ${{ secrets.SSH_PASSWORD }} -# envs: GITHUB_SHA -# script: | -# docker pull choo000407/atties_spring:${GITHUB_SHA::7} -# docker tag choo000407/atties_spring:${GITHUB_SHA::7} atties_spring -# docker-compose up -d + # Docker build + - name: Docker build + run: | + docker login -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_PASSWORD }} + docker build -t atties_dev_spring . + docker tag atties_dev_spring choo000407/atties_dev_spring:${GITHUB_SHA::7} + docker push choo000407/atties_dev_spring:${GITHUB_SHA::7} + # Deploy + - name: Deploy + uses: appleboy/ssh-action@master + with: + host: 43.200.100.183 + username: ubuntu + key: ${{ secrets.SSH_PRIVATE_KEY }} + envs: GITHUB_SHA + script: | + sudo docker pull choo000407/atties_dev_spring:${GITHUB_SHA::7} + sudo docker tag choo000407/atties_dev_spring:${GITHUB_SHA::7} atties_dev_spring + sudo docker-compose up -d From 418f0fcbedbb617170372358a2ac9a68762fe2c3 Mon Sep 17 00:00:00 2001 From: Choo Date: Thu, 9 Mar 2023 02:36:08 +0900 Subject: [PATCH 05/12] =?UTF-8?q?build:=20key=20=ED=8C=8C=EC=9D=BC=20ppk?= =?UTF-8?q?=EC=97=90=EC=84=9C=20pem=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/develop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index f840c3ff..f7edf35a 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -53,7 +53,7 @@ jobs: with: host: 43.200.100.183 username: ubuntu - key: ${{ secrets.SSH_PRIVATE_KEY }} + key: ${{ secrets.SSH_PRIVATE_KEY_DEVELOP }} envs: GITHUB_SHA script: | sudo docker pull choo000407/atties_dev_spring:${GITHUB_SHA::7} From e3855c8add2137154f831f0d507cbccfcbc1d048 Mon Sep 17 00:00:00 2001 From: Choo Date: Thu, 9 Mar 2023 02:54:03 +0900 Subject: [PATCH 06/12] =?UTF-8?q?build:=20openSSHkey=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD,=20passphrase=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/develop.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index f7edf35a..36e636cd 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -54,6 +54,7 @@ jobs: host: 43.200.100.183 username: ubuntu key: ${{ secrets.SSH_PRIVATE_KEY_DEVELOP }} + passphrase: ${{ secrets.SSH_PASSPHRASE }} envs: GITHUB_SHA script: | sudo docker pull choo000407/atties_dev_spring:${GITHUB_SHA::7} From ad95a063f05b4013499d79757ab7e41427b88b26 Mon Sep 17 00:00:00 2001 From: Choo Date: Thu, 9 Mar 2023 02:59:00 +0900 Subject: [PATCH 07/12] =?UTF-8?q?build:=20pull=20request=20=ED=95=A0=20?= =?UTF-8?q?=EB=95=8C=EB=8A=94=20=EC=A0=81=EC=9A=A9=20=EC=95=88=ED=95=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/develop.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index 36e636cd..9cc8b469 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -3,9 +3,6 @@ name: Develop on: push: branches: [ "develop" ] - pull_request: - branches: [ "develop" ] - permissions: contents: read From d52b0322985ea15ba6c64f9c96388637fe298359 Mon Sep 17 00:00:00 2001 From: Choo Date: Thu, 9 Mar 2023 03:16:29 +0900 Subject: [PATCH 08/12] =?UTF-8?q?Build:=20docker=20=EC=9D=B4=EB=AF=B8?= =?UTF-8?q?=EC=A7=80=20=EC=8B=A4=ED=96=89=20=ED=8F=AC=ED=8A=B8=2080?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c43a7b7e..115b63a9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ FROM openjdk:11-jdk-slim-buster COPY build/libs/backend-0.0.1-SNAPSHOT.jar app.jar -EXPOSE 8080 +EXPOSE 80 ENTRYPOINT ["java", "-jar", "/app.jar"] \ No newline at end of file From d5434febafdd87bc50621c972bb3e6ca0038cde5 Mon Sep 17 00:00:00 2001 From: Choo Date: Thu, 9 Mar 2023 03:17:30 +0900 Subject: [PATCH 09/12] =?UTF-8?q?build:=20cicd=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 --- .github/workflows/develop.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index 9cc8b469..36e636cd 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -3,6 +3,9 @@ name: Develop on: push: branches: [ "develop" ] + pull_request: + branches: [ "develop" ] + permissions: contents: read From fe7e09d347f2d7580503d835be1700794ecf1d37 Mon Sep 17 00:00:00 2001 From: Choo Date: Thu, 9 Mar 2023 03:20:44 +0900 Subject: [PATCH 10/12] =?UTF-8?q?fix:=20dockerfile=208080=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EB=90=98=EB=8F=8C=EB=A6=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 115b63a9..c43a7b7e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ FROM openjdk:11-jdk-slim-buster COPY build/libs/backend-0.0.1-SNAPSHOT.jar app.jar -EXPOSE 80 +EXPOSE 8080 ENTRYPOINT ["java", "-jar", "/app.jar"] \ No newline at end of file From 4b7be3fc5e1a5ac6a281babee49e828b3b1c8ff3 Mon Sep 17 00:00:00 2001 From: ChooSeoYeon Date: Thu, 9 Mar 2023 11:22:49 +0900 Subject: [PATCH 11/12] =?UTF-8?q?build:=20port=20=EC=A7=80=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/develop.yml | 1 + Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml index 36e636cd..1e109b07 100644 --- a/.github/workflows/develop.yml +++ b/.github/workflows/develop.yml @@ -55,6 +55,7 @@ jobs: username: ubuntu key: ${{ secrets.SSH_PRIVATE_KEY_DEVELOP }} passphrase: ${{ secrets.SSH_PASSPHRASE }} + port: 22 envs: GITHUB_SHA script: | sudo docker pull choo000407/atties_dev_spring:${GITHUB_SHA::7} diff --git a/Dockerfile b/Dockerfile index c43a7b7e..115b63a9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ FROM openjdk:11-jdk-slim-buster COPY build/libs/backend-0.0.1-SNAPSHOT.jar app.jar -EXPOSE 8080 +EXPOSE 80 ENTRYPOINT ["java", "-jar", "/app.jar"] \ No newline at end of file From dd6dfbf0937a6b1fe4e32013568dbf31dbb691c2 Mon Sep 17 00:00:00 2001 From: ChooSeoYeon Date: Thu, 9 Mar 2023 11:29:15 +0900 Subject: [PATCH 12/12] =?UTF-8?q?build:=20=EC=BB=A8=ED=85=8C=EC=9D=B4?= =?UTF-8?q?=EB=84=88=20=EB=85=B8=EC=B6=9C=20=ED=8F=AC=ED=8A=B8=208080=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 115b63a9..c43a7b7e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ FROM openjdk:11-jdk-slim-buster COPY build/libs/backend-0.0.1-SNAPSHOT.jar app.jar -EXPOSE 80 +EXPOSE 8080 ENTRYPOINT ["java", "-jar", "/app.jar"] \ No newline at end of file