Skip to content

Commit a30e980

Browse files
Merge branch 'develop' into release
2 parents 1c0e6ff + c0286b1 commit a30e980

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

.github/workflows/CD.yml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: CD for front using github actions
33

44
on:
55
release:
6-
types: [created]
6+
types: [ created ]
77

88
permissions:
99
contents: read
@@ -37,26 +37,17 @@ jobs:
3737
run: touch ./nginxfile.conf
3838
- run: echo "${{ secrets.NGINX_FILE_CONF }}" > ./nginxfile.conf
3939

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

45-
# docker build & push to develop
46-
- name: Docker build & push develop
4744
# docker build & push to develop
4845
- name: Docker build & push develop
4946
run: |
5047
docker login clap.kr-central-2.kcr.dev -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
5148
docker build -t ${{ secrets.DOCKER_FRONT_REPO }} .
5249
docker push ${{ secrets.DOCKER_FRONT_REPO }}
5350
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 }}
59-
6051
# deploy
6152
- name: Deploy Develop
6253
uses: appleboy/ssh-action@master
@@ -72,7 +63,7 @@ jobs:
7263
docker run --name taskflow-front -d -p 80:80 -p 443:443 -v /etc/letsencrypt/:/etc/letsencrypt/ -v /etc/ssl/:/etc/ssl/ --restart on-failure ${{ secrets.DOCKER_FRONT_REPO }}
7364
7465
- name: Create Production nginx.conf
75-
- run: echo "${{ secrets.PROD_NGINX_CONF }}" > ./nginx.conf
66+
run: echo "${{ secrets.PROD_NGINX_CONF }}" > ./nginx.conf
7667

7768
# docker build & push to production
7869
- name: Docker build & push production
@@ -84,7 +75,7 @@ jobs:
8475
run: |
8576
envsubst < ./taskflow.yaml
8677
env:
87-
IMAGE_TAG: ${{ env.IMAGE_TAG }}
78+
IMAGE_TAG: ${{ steps.version.outputs.VERSION }}
8879

8980
# deploy
9081
- name: Transport taskflow.yaml to kubectl server

taskflow.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@ spec:
5050
nodeSelector:
5151
label: "front"
5252
imagePullSecrets:
53-
- name: kc-cr-secret
53+
- name: kc-cr-secret

0 commit comments

Comments
 (0)