v1.5.1 (#255)

GDSC-Hongik · Mar 5, 2024 · 3e11a37 · 3e11a37
2 parents 19a3ac1 + e462a38
commit 3e11a37
Show file tree

Hide file tree

Showing 7 changed files with 71 additions and 36 deletions.
diff --git a/.github/workflows/develop_build_deploy.yml b/.github/workflows/develop_build_deploy.yml
@@ -2,7 +2,7 @@ name: Build and Deploy to Develop
 
 on:
   push:
-    branches: [ "develop" ]
+    branches: ["develop"]
 
 permissions:
   id-token: write
@@ -17,8 +17,8 @@ jobs:
     environment: develop
     strategy:
       matrix:
-        java-version: [ 17 ]
-        distribution: [ 'temurin' ]
+        java-version: [17]
+        distribution: ["temurin"]
     steps:
       # 체크아웃
       - name: Checkout
@@ -103,12 +103,13 @@ jobs:
         uses: Ilshidur/action-discord@master
         env:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-          DISCORD_EMBEDS: '[
-            {
-              "title": "푸드덕푸드덕푸드덕",
-              "description": "구구구구국 구구...: ${{ steps.gradle.outputs.build-scan-url }}"
-            }
-          ]'
+          DISCORD_EMBEDS: |
+            [
+              {
+                "title": "푸드덕푸드덕푸드덕",
+                "description": "구구구구국 구구...: ${{ steps.gradle.outputs.build-scan-url }}"
+              }
+            ]
 
       # EC2로 배포
       - name: Deploy to EC2 Server
@@ -120,7 +121,7 @@ jobs:
           host: ${{ secrets.EC2_HOST }}
           username: ${{ secrets.EC2_USERNAME }}
           key: ${{ secrets.EC2_PRIVATE_KEY }}
-          envs: IMAGE_FULL_URL  # docker-compose.yml 에서 사용할 환경 변수
+          envs: IMAGE_FULL_URL # docker-compose.yml 에서 사용할 환경 변수
           script: |
             aws s3 cp ${{ env.S3_COPY_PATH }} docker-compose.yml
             echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin

diff --git a/.github/workflows/develop_deploy.yml b/.github/workflows/develop_deploy.yml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
     inputs:
       commit_hash:
-        description: 'commit_hash'
+        description: "commit_hash"
         required: true
 
 jobs:
@@ -16,14 +16,14 @@ jobs:
         uses: appleboy/ssh-action@master
         env:
           DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-          DOCKERHUB_IMAGE_TAG: ${{ github.event.inputs.commit_hash }}
+          IMAGE_FULL_URL: ${{ secrets.DOCKERHUB_USERNAME }}/gdsc-server:${{ github.event.inputs.commit_hash }}
         with:
-            host: ${{ secrets.EC2_HOST }}
-            username: ${{ secrets.EC2_USERNAME }}
-            key: ${{ secrets.EC2_PRIVATE_KEY }}
-            envs: DOCKERHUB_USERNAME,DOCKERHUB_IMAGE_TAG  # docker-compose.yml 에서 사용할 환경 변수
-            script: |
-              echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
-              docker pull ${{ env.DOCKERHUB_USERNAME }}/gdsc-server:${{ env.DOCKERHUB_IMAGE_TAG }}
-              docker compose -f /home/ubuntu/docker-compose.yml up -d
-              docker image prune -a -f
+          host: ${{ secrets.EC2_HOST }}
+          username: ${{ secrets.EC2_USERNAME }}
+          key: ${{ secrets.EC2_PRIVATE_KEY }}
+          envs: IMAGE_FULL_URL # docker-compose.yml 에서 사용할 환경 변수
+          script: |
+            echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
+            docker pull ${{ env.IMAGE_FULL_URL }}
+            docker compose up -d
+            docker image prune -a -f
diff --git a/.github/workflows/production_build_deploy.yml b/.github/workflows/production_build_deploy.yml
@@ -17,8 +17,8 @@ jobs:
     environment: production
     strategy:
       matrix:
-        java-version: [ 17 ]
-        distribution: [ 'temurin' ]
+        java-version: [17]
+        distribution: ["temurin"]
     steps:
       # 체크아웃
       - name: Checkout
@@ -119,12 +119,13 @@ jobs:
         uses: Ilshidur/action-discord@master
         env:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
-          DISCORD_EMBEDS: '[
-            {
-              "title": "푸드덕푸드덕푸드덕",
-              "description": "구구구구국 구구...: ${{ steps.gradle.outputs.build-scan-url }}"
-            }
-          ]'
+          DISCORD_EMBEDS: |
+            [
+              {
+                "title": "푸드덕푸드덕푸드덕",
+                "description": "구구구구국 구구...: ${{ steps.gradle.outputs.build-scan-url }}"
+              }
+            ]
 
       - name: Deploy to EC2 Server
         uses: appleboy/ssh-action@master
@@ -135,7 +136,7 @@ jobs:
           host: ${{ secrets.EC2_HOST }}
           username: ${{ secrets.EC2_USERNAME }}
           key: ${{ secrets.EC2_PRIVATE_KEY }}
-          envs: IMAGE_FULL_URL  # docker-compose.yml 에서 사용할 환경 변수
+          envs: IMAGE_FULL_URL # docker-compose.yml 에서 사용할 환경 변수
           script: |
             aws s3 cp ${{ env.S3_COPY_PATH }} docker-compose.yml
             echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin

diff --git a/.github/workflows/production_deploy.yml b/.github/workflows/production_deploy.yml
@@ -0,0 +1,29 @@
+name: Deploy to Production
+
+on:
+  workflow_dispatch:
+    inputs:
+      semver:
+        description: "semver without v"
+        required: true
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    environment: production
+    steps:
+      - name: Deploy to EC2 Server
+        uses: appleboy/ssh-action@master
+        env:
+          DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+          IMAGE_FULL_URL: ${{ secrets.DOCKERHUB_USERNAME }}/gdsc-server:${{ github.event.inputs.semver }}
+        with:
+          host: ${{ secrets.EC2_HOST }}
+          username: ${{ secrets.EC2_USERNAME }}
+          key: ${{ secrets.EC2_PRIVATE_KEY }}
+          envs: IMAGE_FULL_URL # docker-compose.yml 에서 사용할 환경 변수
+          script: |
+            echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
+            docker pull ${{ env.IMAGE_FULL_URL }}
+            docker-compose up -d
+            docker image prune -a -f
diff --git a/.github/workflows/pull_request_gradle_build.yml b/.github/workflows/pull_request_gradle_build.yml
@@ -1,8 +1,8 @@
-name : Check Style and Test to Develop
+name: Check Style and Test to Develop
 
 on:
   pull_request:
-    branches: [ "develop" ]
+    branches: ["develop"]
 
 jobs:
   build-test:

diff --git a/build.gradle b/build.gradle
@@ -91,7 +91,7 @@ jar {
 
 spotless {
     format 'misc', {
-        target '**/*.yml', '**/*.gradle', '**/*.md'
+        target '**/*.gradle', '**/*.md'
         trimTrailingWhitespace()
         indentWithSpaces(4)
         endWithNewline()
@@ -102,6 +102,11 @@ spotless {
         palantirJavaFormat()
         formatAnnotations()
     }
+
+    yaml {
+        target '**/*.yml'
+        prettier()
+    }
 }
 
 tasks.register('updateGitHooks', Copy) {

diff --git a/src/main/java/com/gdschongik/gdsc/domain/member/dto/request/MemberUpdateRequest.java b/src/main/java/com/gdschongik/gdsc/domain/member/dto/request/MemberUpdateRequest.java
@@ -21,8 +21,7 @@ public record MemberUpdateRequest(
                 String phone,
         @NotNull @Schema(description = "학과") Department department,
         @NotBlank @Email @Schema(description = "이메일") String email,
-        @NotBlank @Schema(description = "디스코드 유저네임") String discordUsername,
-        @NotBlank
-                @Pattern(regexp = NICKNAME, message = "닉네임은 " + NICKNAME + " 형식이어야 합니다.")
+        @Schema(description = "디스코드 유저네임") String discordUsername,
+        @Pattern(regexp = NICKNAME, message = "닉네임은 " + NICKNAME + " 형식이어야 합니다.")
                 @Schema(description = "커뮤니티 닉네임", pattern = NICKNAME)
                 String nickname) {}