Skip to content

Commit b952246

Browse files
authored
Merge pull request #265 from Modagbul/main
[release] deploy 프로필 설정 수정
2 parents c24e5ff + 173806e commit b952246

File tree

4 files changed

+21
-5
lines changed

4 files changed

+21
-5
lines changed

.deploy/Dockerfile renamed to .deploy/dev_dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ COPY ${JAR_FILE} app.jar
1212
COPY ./build/docs/asciidoc/*.html /static/docs/
1313

1414
# 애플리케이션 실행 시 -cp 옵션을 사용하여 /static/docs 디렉토리를 클래스패스에 추가
15-
ENTRYPOINT ["java","-cp",".:/static/docs","-jar","/app.jar"]
15+
ENTRYPOINT ["java","-cp",".:/static/docs","-Dspring.profiles.active=dev","-jar","/app.jar"]
1616

.deploy/prod_dockerfile

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
FROM openjdk:11-jdk
2+
3+
# 타임존 설정
4+
ENV TZ=Asia/Seoul
5+
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
6+
7+
ARG CACHEBREAKER=1
8+
ARG JAR_FILE=./build/libs/backend-0.0.1-SNAPSHOT.jar
9+
COPY ${JAR_FILE} app.jar
10+
11+
# 문서를 이미지의 /static/docs 디렉토리에 복사
12+
COPY ./build/docs/asciidoc/*.html /static/docs/
13+
14+
# 애플리케이션 실행 시 -cp 옵션을 사용하여 /static/docs 디렉토리를 클래스패스에 추가
15+
ENTRYPOINT ["java","-cp",".:/static/docs","-Dspring.profiles.active=prod","-jar","/app.jar"]
16+

.github/workflows/CD-dev.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ jobs:
8585
# Docker 이미지 빌드 및 푸시
8686
- name: Docker build
8787
run: |
88-
docker build --no-cache -f ./.deploy/Dockerfile -t ${{ secrets.DOCKER_USERNAME_DEV }}/moing_dev:green .
89-
docker build --no-cache -f ./.deploy/Dockerfile -t ${{ secrets.DOCKER_USERNAME_DEV }}/moing_dev:blue .
88+
docker build --no-cache -f ./.deploy/dev_dockerfile -t ${{ secrets.DOCKER_USERNAME_DEV }}/moing_dev:green .
89+
docker build --no-cache -f ./.deploy/dev_dockerfile -t ${{ secrets.DOCKER_USERNAME_DEV }}/moing_dev:blue .
9090
9191
9292
- name: Docker Hub Login

.github/workflows/CD-prod.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ jobs:
8585
# Docker 이미지 빌드 및 푸시
8686
- name: Docker build
8787
run: |
88-
docker build --no-cache -f ./.deploy/Dockerfile -t ${{ secrets.DOCKER_USERNAME_PROD }}/moing_prod:green .
89-
docker build --no-cache -f ./.deploy/Dockerfile -t ${{ secrets.DOCKER_USERNAME_PROD }}/moing_prod:blue .
88+
docker build --no-cache -f ./.deploy/prod_dockerfile -t ${{ secrets.DOCKER_USERNAME_PROD }}/moing_prod:green .
89+
docker build --no-cache -f ./.deploy/prod_dockerfile -t ${{ secrets.DOCKER_USERNAME_PROD }}/moing_prod:blue .
9090
9191
9292
- name: Docker Hub Login

0 commit comments

Comments
 (0)