Skip to content

Commit 1c0e6ff

Browse files
committed
🐛 [fix] : CD.yml conflict resolved
2 parents 210258b + 773076f commit 1c0e6ff

1 file changed

Lines changed: 12 additions & 5 deletions

File tree

.github/workflows/CD.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ jobs:
1414
steps:
1515
# 저장소 코드를 체크아웃합니다. (PR 올린 코드를 가져오는 행위)
1616
- uses: actions/checkout@v4
17-
with:
18-
ref: release
1917

2018
# Node.js 환경 설정
2119
- name: Use Node.js
@@ -39,16 +37,25 @@ jobs:
3937
run: touch ./nginxfile.conf
4038
- run: echo "${{ secrets.NGINX_FILE_CONF }}" > ./nginxfile.conf
4139

40+
- name: Create Develop nginx.conf
4241
- name: Create Develop nginx.conf
4342
run: touch ./nginx.conf
4443
- run: echo "${{ secrets.NGINX_CONF }}" > ./nginx.conf
4544

45+
# docker build & push to develop
46+
- name: Docker build & push develop
4647
# docker build & push to develop
4748
- name: Docker build & push develop
4849
run: |
49-
docker login clap.kr-central-2.kcr.dev -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
50-
docker build -t ${{ secrets.DOCKER_FRONT_REPO }} .
51-
docker push ${{ secrets.DOCKER_FRONT_REPO }}
50+
docker login clap.kr-central-2.kcr.dev -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
51+
docker build -t ${{ secrets.DOCKER_FRONT_REPO }} .
52+
docker push ${{ secrets.DOCKER_FRONT_REPO }}
53+
54+
# deploy
55+
- name: Deploy Develop
56+
docker login clap.kr-central-2.kcr.dev -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
57+
docker build -t ${{ secrets.DOCKER_FRONT_REPO }} .
58+
docker push ${{ secrets.DOCKER_FRONT_REPO }}
5259

5360
# deploy
5461
- name: Deploy Develop

0 commit comments

Comments
 (0)