diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 9c230820..827f50f5 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -82,14 +82,14 @@ jobs: set -e cd /home/ec2-user/deploy + # 불필요한 도커 이미지 및 컨테이너 정리 + docker system prune -a -f || true + docker pull ${{ secrets.DOCKERHUB_USERNAME }}/eatsfine-be:latest docker compose down docker compose up -d - # 불필요한 도커 이미지 및 컨테이너 정리 - docker image prune -f - docker ps EOF - name: GitHub Actions - SSH 및 컨테이너 실제 포트 접근 권한 제거 diff --git a/src/main/java/com/eatsfine/eatsfine/domain/user/status/UserErrorStatus.java b/src/main/java/com/eatsfine/eatsfine/domain/user/status/UserErrorStatus.java index 8eb69457..a4c8b147 100644 --- a/src/main/java/com/eatsfine/eatsfine/domain/user/status/UserErrorStatus.java +++ b/src/main/java/com/eatsfine/eatsfine/domain/user/status/UserErrorStatus.java @@ -18,7 +18,6 @@ public enum UserErrorStatus implements BaseErrorCode { PASSWORD_NOT_MATCH(HttpStatus.BAD_REQUEST, "MEMBER4005", "현재 비밀번호가 일치하지 않습니다."), SAME_PASSWORD(HttpStatus.BAD_REQUEST, "MEMBER4006", "새 비밀번호가 현재 비밀번호와 동일합니다."), WITHDRAWN_USER(HttpStatus.FORBIDDEN, "MEMBER4007", "탈퇴한 회원입니다.") - ; private final HttpStatus httpStatus; diff --git a/src/main/java/com/eatsfine/eatsfine/global/auth/AuthCookieProvider.java b/src/main/java/com/eatsfine/eatsfine/global/auth/AuthCookieProvider.java index 8e47f898..087bc510 100644 --- a/src/main/java/com/eatsfine/eatsfine/global/auth/AuthCookieProvider.java +++ b/src/main/java/com/eatsfine/eatsfine/global/auth/AuthCookieProvider.java @@ -15,8 +15,8 @@ public ResponseCookie refreshTokenCookie(String refreshToken) { return ResponseCookie.from("refreshToken", refreshToken) .httpOnly(true) .secure(true) - .sameSite("None") // Lax → None - .domain(".eatsfine.co.kr") //로컬 개발로 인해 주석 처리 + .sameSite("None") + .domain(".eatsfine.co.kr") .path("/") .maxAge(Duration.ofDays(14)) .build();