Skip to content

Commit

Permalink
#600 [feat] 서버 이관 작업을 위한 전반적인 작업 (#601)
Browse files Browse the repository at this point in the history
* #600 [feat] 트리거 옵션 변경 (릴리즈 태그 생성 시)

* #600 [feat] 트리거 옵션 변경 (확인용)

* #600 [feat] 트리거 옵션 변경

* #600 [feat] 이미지 설정변경

* #600 [feat] cd yml 삭제 및 이름변경

* #600 [feat] 트리거 이벤트 변경 (실험)

* #600 [feat] 롤백
  • Loading branch information
sohyundoh authored Feb 1, 2025
1 parent 423cf57 commit 366619d
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 82 deletions.
68 changes: 0 additions & 68 deletions .github/workflows/PROD-CD.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
name: PROD-NEW-CD
name: PROD-V2-CD

on:
push:
branches: [ "main" ]
release:
types: [published]


jobs:
production-deploy-ci:
Expand Down Expand Up @@ -63,10 +64,4 @@ jobs:
key: ${{ secrets.NEW_PROD_SSH }}
script: |
cd ~
if docker ps | grep -q redis && docker ps | grep -q nginx; then
docker-compose pull app
docker-compose up -d --no-deps app
else
docker-compose pull
docker-compose up -d --build --remove-orphans
fi
./deploy.sh
3 changes: 2 additions & 1 deletion module-domain/src/main/java/com/mile/moim/domain/Moim.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.mile.common.config.BaseTimeEntity;
import com.mile.moim.service.dto.request.MoimCreateRequest;
import com.mile.moim.service.dto.request.MoimInfoModifyRequest;
import com.mile.util.ImageUrlUtil;
import com.mile.writername.domain.WriterName;
import jakarta.persistence.CascadeType;
import jakarta.persistence.Column;
Expand Down Expand Up @@ -76,7 +77,7 @@ private Moim(
public static Moim create(
final MoimCreateRequest moimCreateRequest
) {
String DEFAULT_IMG_URL = "https://mile-s3.s3.ap-northeast-2.amazonaws.com/test/groupMile.png";
String DEFAULT_IMG_URL = ImageUrlUtil.defaultV1;

return Moim.builder()
.name(moimCreateRequest.moimName())
Expand Down
5 changes: 3 additions & 2 deletions module-domain/src/main/java/com/mile/post/domain/Post.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.mile.common.config.BaseTimeEntity;
import com.mile.post.service.dto.request.PostPutRequest;
import com.mile.topic.domain.Topic;
import com.mile.util.ImageUrlUtil;
import com.mile.writername.domain.WriterName;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
Expand Down Expand Up @@ -91,7 +92,7 @@ public void updatePost(
final Topic topic,
final PostPutRequest putRequest
) {
final String DEFAULT_IMAGE = "https://mile-s3.s3.ap-northeast-2.amazonaws.com/test/groupMile.png";
final String DEFAULT_IMAGE = ImageUrlUtil.defaultV1;
this.topic = topic;
this.title = putRequest.title();
this.content = putRequest.content();
Expand All @@ -112,7 +113,7 @@ private static String returnImageUrl(
final String imageUrl,
final boolean containPhoto
) {
final String DEFAULT_IMAGE = "https://mile-s3.s3.ap-northeast-2.amazonaws.com/test/groupMile.png";
final String DEFAULT_IMAGE = ImageUrlUtil.defaultV1;
if (!containPhoto) {
return DEFAULT_IMAGE;
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.mile.post.service.dto.request.TemporaryPostCreateRequest;
import com.mile.topic.domain.Topic;
import com.mile.common.utils.SecureUrlUtil;
import com.mile.util.ImageUrlUtil;
import com.mile.writername.domain.WriterName;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
Expand All @@ -18,7 +19,7 @@ public class PostCreator {
private final PostRepository postRepository;
private final SecureUrlUtil secureUrlUtil;
private static final boolean TEMPORARY_TRUE = true;
private static final String DEFAULT_IMG_URL = "https://mile-s3.s3.ap-northeast-2.amazonaws.com/test/groupMile.png";
private static final String DEFAULT_IMG_URL = ImageUrlUtil.defaultV1;
private static final boolean TEMPORARY_FALSE = false;

private boolean checkContainPhoto(final String imageUrl) {
Expand Down
5 changes: 5 additions & 0 deletions module-domain/src/main/java/com/mile/util/ImageUrlUtil.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package com.mile.util;

public class ImageUrlUtil {
public static String defaultV1 = "https://mile-new-s3.s3.ap-northeast-2.amazonaws.com/mile.png";
}

0 comments on commit 366619d

Please sign in to comment.