v1.0.1 (#156)

GDSC-Hongik · Feb 26, 2024 · e76da7b · e76da7b
2 parents 4f61cbc + 0295ef7
commit e76da7b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/.github/workflows/production_build_deploy.yml b/.github/workflows/production_build_deploy.yml
@@ -77,11 +77,20 @@ jobs:
           tags: |
             type=semver,pattern={{version}}
 
+      # 멀티 아키텍처 지원을 위한 QEMU 설정
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      # 도커 확장 빌드를 위한 Buildx 설정
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       # 이미지 빌드 및 Dockerhub에 푸시
       - name: Docker Build and Push
         uses: docker/build-push-action@v5
         with:
           context: .
+          platforms: linux/arm64/v8
           push: true
           tags: ${{ secrets.DOCKERHUB_USERNAME }}/gdsc-server:${{ steps.image-tag.outputs.value }}
 
@@ -97,7 +106,7 @@ jobs:
       - name: Set up S3 copy path
         env:
           S3_DEPLOY_BUCKET_NAME: ${{ secrets.S3_DEPLOY_BUCKET_NAME }}
-        run: echo "S3_COPY_PATH=$(echo s3://${S3_DEPLOY_BUCKET_NAME}/gdsc/docker-compose-dev.yml)" >> $GITHUB_ENV
+        run: echo "S3_COPY_PATH=$(echo s3://${S3_DEPLOY_BUCKET_NAME}/gdsc/docker-compose-prod.yml)" >> $GITHUB_ENV
 
       # S3로 docker-compose 파일 전송
       - name: Copy docker-compose file to S3

diff --git a/src/main/java/com/gdschongik/gdsc/domain/member/dto/request/MemberQueryRequest.java b/src/main/java/com/gdschongik/gdsc/domain/member/dto/request/MemberQueryRequest.java
@@ -9,7 +9,7 @@ public record MemberQueryRequest(
         @Schema(description = "학번", pattern = STUDENT_ID) String studentId,
         @Schema(description = "이름") String name,
         @Schema(description = "전화번호", pattern = PHONE_WITHOUT_HYPHEN) String phone,
-        @Schema(description = "학과", pattern = DEPARTMENT) Department department,
+        @Schema(description = "학과") Department department,
         @Schema(description = "이메일") String email,
         @Schema(description = "디스코드 유저네임") String discordUsername,
         @Schema(description = "커뮤니티 닉네임", pattern = NICKNAME) String nickname) {}
diff --git a/src/main/java/com/gdschongik/gdsc/domain/member/dto/request/MemberSignupRequest.java b/src/main/java/com/gdschongik/gdsc/domain/member/dto/request/MemberSignupRequest.java
@@ -6,6 +6,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Pattern;
 
 public record MemberSignupRequest(
@@ -18,8 +19,5 @@ public record MemberSignupRequest(
                 @Pattern(regexp = PHONE_WITHOUT_HYPHEN, message = "전화번호는 " + PHONE_WITHOUT_HYPHEN + " 형식이어야 합니다.")
                 @Schema(description = "전화번호", pattern = PHONE_WITHOUT_HYPHEN)
                 String phone,
-        @NotBlank
-                @Pattern(regexp = DEPARTMENT, message = "학과는 " + DEPARTMENT + " 형식이어야 합니다.")
-                @Schema(description = "학과", pattern = DEPARTMENT)
-                Department department,
+        @NotNull @Schema(description = "학과") Department department,
         @NotBlank @Email @Schema(description = "이메일") String email) {}
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
@@ -6,6 +6,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Pattern;
 
 public record MemberUpdateRequest(
@@ -18,10 +19,7 @@ public record MemberUpdateRequest(
                 @Pattern(regexp = PHONE_WITHOUT_HYPHEN, message = "전화번호는 " + PHONE_WITHOUT_HYPHEN + " 형식이어야 합니다.")
                 @Schema(description = "전화번호", pattern = PHONE_WITHOUT_HYPHEN)
                 String phone,
-        @NotBlank
-                @Pattern(regexp = DEPARTMENT, message = "학과는 " + DEPARTMENT + " 형식이어야 합니다.")
-                @Schema(description = "학과", pattern = DEPARTMENT)
-                Department department,
+        @NotNull @Schema(description = "학과") Department department,
         @NotBlank @Email @Schema(description = "이메일") String email,
         @NotBlank @Schema(description = "디스코드 유저네임") String discordUsername,
         @NotBlank