11주차 PR (Master <- Develop)

.github/workflows/gradle.yml

@@ -3,21 +3,22 @@ name: CI/CD Github Action
 on:
   push:
     branches: [ "Master", "Weekly/*" ]
-  pull_request_target:
-    branches: [ "Master", "Weekly/*" ]
 
 permissions:
   contents: read
 
 env:
+  DATASOURCE_URL      : ${{ secrets.ENV_DATASOURCE_URL }}
+  DATASOURCE_USERNAME : ${{ secrets.ENV_DATASOURCE_USERNAME }}
+  DATASOURCE_PASSWORD : ${{ secrets.ENV_DATASOURCE_PASSWORD }}
   GOOGLE_CLIENT_ID    : ${{ secrets.ENV_GOOGLE_CLIENT_ID }}
   GOOGLE_CLIENT_SECRET: ${{ secrets.ENV_GOOGLE_CLIENT_SECRET }}
-  GOOGLE_REDIRECT_URI : ${{ secrets.ENV_GOOGLE_REDIRECT_URI }}
+  IMAGE_UPLOAD_PATH   : ${{ secrets.ENV_IMAGE_UPLOAD_PATH }}
   JWT_SECRET          : ${{ secrets.ENV_JWT_SECRET }}
   KAKAO_CLIENT_ID     : ${{ secrets.ENV_KAKAO_CLIENT_ID }}
   KAKAO_CLIENT_SECRET : ${{ secrets.ENV_KAKAO_CLIENT_SECRET }}
-  KAKAO_REDIRECT_URI  : ${{ secrets.ENV_KAKAO_REDIRECT_URI }}
   KAKAOPAY_SECRET_KEY : ${{ secrets.ENV_KAKAOPAY_SECRET_KEY }}
+  SERVER_DOMAIN_NAME  : ${{ secrets.ENV_SERVER_DOMAIN_NAME }}
 
 jobs:
   ## 1단계: 프로젝트 빌드
@@ -137,14 +138,17 @@ jobs:
           key: ${{ secrets.SSH_PRIVATE_KEY }}
           port: ${{ secrets.SSH_PORT }}
           script: |
-            echo "GOOGLE_CLIENT_ID=${{ secrets.ENV_GOOGLE_CLIENT_ID }}" > ~/.env
+            echo "DATASOURCE_URL=${{ secrets.ENV_DATASOURCE_URL }}" > ~/.env
+            echo "DATASOURCE_USERNAME=${{ secrets.ENV_DATASOURCE_USERNAME }}" >> ~/.env
+            echo "DATASOURCE_PASSWORD=${{ secrets.ENV_DATASOURCE_PASSWORD }}" >> ~/.env
+            echo "GOOGLE_CLIENT_ID=${{ secrets.ENV_GOOGLE_CLIENT_ID }}" >> ~/.env
             echo "GOOGLE_CLIENT_SECRET=${{ secrets.ENV_GOOGLE_CLIENT_SECRET }}" >> ~/.env
-            echo "GOOGLE_REDIRECT_URI=${{ secrets.ENV_GOOGLE_REDIRECT_URI }}" >> ~/.env
             echo "JWT_SECRET=${{ secrets.ENV_JWT_SECRET }}" >> ~/.env
+            echo "IMAGE_UPLOAD_PATH=${{ secrets.ENV_IMAGE_UPLOAD_PATH }}" >> ~/.env
             echo "KAKAO_CLIENT_ID=${{ secrets.ENV_KAKAO_CLIENT_ID }}" >> ~/.env
             echo "KAKAO_CLIENT_SECRET=${{ secrets.ENV_KAKAO_CLIENT_SECRET }}" >> ~/.env
-            echo "KAKAO_REDIRECT_URI=${{ secrets.ENV_KAKAO_REDIRECT_URI }}" >> ~/.env
             echo "KAKAOPAY_SECRET_KEY=${{ secrets.ENV_KAKAOPAY_SECRET_KEY }}" >> ~/.env
+            echo "SERVER_DOMAIN_NAME=${{ secrets.ENV_SERVER_DOMAIN_NAME }}" >> ~/.env
             echo "Environment setup has been completed."
 
       - name: Pull New Docker Image
@@ -175,7 +179,7 @@ jobs:
           key: ${{ secrets.SSH_PRIVATE_KEY }}
           port: ${{ secrets.SSH_PORT }}
           envs: GITHUB_SHA
-          script: sudo docker run --rm -d -p 80:8080 --env-file ~/.env --name would-you-in ${{ secrets.DOCKER_REPO_FULLNAME }}
+          script: sudo docker run --rm -d -p 80:8080 --env-file ~/.env --name would-you-in -v would-you-in-image-volume:${{ secrets.ENV_IMAGE_UPLOAD_PATH }} ${{ secrets.DOCKER_REPO_FULLNAME }}
 
       - name: Clean-Up Docker Image
         uses: appleboy/ssh-action@master

.gitignore

@@ -37,7 +37,7 @@ out/
 .vscode/
 
 ### static images
-/src/main/resources/staticimages/
+/src/main/resources/static/images/
 
 ### env file
 .env

build.gradle

@@ -29,13 +29,12 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
-    implementation 'com.h2database:h2'
     implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
     implementation 'com.fasterxml.jackson.core:jackson-databind'
+    implementation group: 'net.coobird', name: 'thumbnailator', version: '0.4.14'
     compileOnly 'org.projectlombok:lombok'
     developmentOnly 'org.springframework.boot:spring-boot-devtools'
     runtimeOnly 'com.mysql:mysql-connector-j'
-    runtimeOnly 'com.h2database:h2'
     annotationProcessor 'org.projectlombok:lombok'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.springframework.security:spring-security-test'
@@ -50,6 +49,8 @@ dependencies {
 
     //for test
     implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
+    testCompileOnly 'org.projectlombok:lombok'
+    testAnnotationProcessor 'org.projectlombok:lombok'
 
     //for Swagger
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.1.0'