Skip to content

Commit e5d9488

Browse files
thisishwan2thisishwan2
committed
fix: 어플리케이션과 모니터링 cicd 분리
1 parent 1378ee2 commit e5d9488

1 file changed

Lines changed: 67 additions & 67 deletions

File tree

‎.github/workflows/cicd-workflow.yml‎

Lines changed: 67 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -30,26 +30,26 @@ jobs:
3030
token: ${{ secrets.ACTION_TOKEN }}
3131
submodules: true
3232

33-
# 2-1. 환경변수(yml) 파일이 있는지 확인
34-
- name: Check if config files exist - dev
35-
if: github.ref == 'refs/heads/develop'
36-
run: |
37-
echo "Current Directory: $(pwd)"
38-
cd config
39-
echo "Current Directory: $(pwd)"
40-
cd dev
41-
echo "Current Directory: $(pwd)"
42-
ls -al
43-
44-
- name: Check if config files exist - prod
45-
if: github.ref == 'refs/heads/release'
46-
run: |
47-
echo "Current Directory: $(pwd)"
48-
cd config
49-
echo "Current Directory: $(pwd)"
50-
cd prod
51-
echo "Current Directory: $(pwd)"
52-
ls -al
33+
# # 2-1. 환경변수(yml) 파일이 있는지 확인
34+
# - name: Check if config files exist - dev
35+
# if: github.ref == 'refs/heads/develop'
36+
# run: |
37+
# echo "Current Directory: $(pwd)"
38+
# cd config
39+
# echo "Current Directory: $(pwd)"
40+
# cd dev
41+
# echo "Current Directory: $(pwd)"
42+
# ls -al
43+
#
44+
# - name: Check if config files exist - prod
45+
# if: github.ref == 'refs/heads/release'
46+
# run: |
47+
# echo "Current Directory: $(pwd)"
48+
# cd config
49+
# echo "Current Directory: $(pwd)"
50+
# cd prod
51+
# echo "Current Directory: $(pwd)"
52+
# ls -al
5353

5454
# 3. AWS 자격 증명 구성
5555
- name: Configure AWS credentials
@@ -160,26 +160,26 @@ jobs:
160160
docker push ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.ap-northeast-2.amazonaws.com/${{ secrets.ECR_REPO_NAME_DEV }}:latest # 이미지를 ECR에 푸시합니다.
161161
echo "image=${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.ap-northeast-2.amazonaws.com/${{ secrets.ECR_REPO_NAME_DEV }}:latest" >> $GITHUB_OUTPUT
162162
163-
# 8-1. Prometheus Docker 이미지 빌드 및 푸시
164-
- name: Build Prometheus image - release
165-
if: github.ref == 'refs/heads/release'
166-
id: build-prom-image-release
167-
run: |
168-
cp config/prod/application-prometheus-prod.yml ./prometheus.yml
169-
docker build --platform linux/amd64 -f monitoring/Dockerfile -t ${{ secrets.ECR_REPO_NAME_PROMETHEUS_PROD }} .
170-
docker tag ${{ secrets.ECR_REPO_NAME_PROMETHEUS_PROD }}:latest ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.ap-northeast-2.amazonaws.com/${{ secrets.ECR_REPO_NAME_PROMETHEUS_PROD }}:latest
171-
docker push ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.ap-northeast-2.amazonaws.com/${{ secrets.ECR_REPO_NAME_PROMETHEUS_PROD }}:latest
172-
echo "image=${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.ap-northeast-2.amazonaws.com/${{ secrets.ECR_REPO_NAME_PROMETHEUS_PROD }}:latest" >> $GITHUB_OUTPUT
173-
174-
- name: Build Prometheus image - develop
175-
if: github.ref == 'refs/heads/develop'
176-
id: build-prom-image-develop
177-
run: |
178-
cp config/dev/application-prometheus-dev.yml ./prometheus.yml
179-
docker build --platform linux/amd64 -f monitoring/Dockerfile -t ${{ secrets.ECR_REPO_NAME_PROMETHEUS_DEV }} .
180-
docker tag ${{ secrets.ECR_REPO_NAME_PROMETHEUS_DEV }}:latest ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.ap-northeast-2.amazonaws.com/${{ secrets.ECR_REPO_NAME_PROMETHEUS_DEV }}:latest
181-
docker push ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.ap-northeast-2.amazonaws.com/${{ secrets.ECR_REPO_NAME_PROMETHEUS_DEV }}:latest
182-
echo "image=${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.ap-northeast-2.amazonaws.com/${{ secrets.ECR_REPO_NAME_PROMETHEUS_DEV }}:latest" >> $GITHUB_OUTPUT
163+
# # 8-1. Prometheus Docker 이미지 빌드 및 푸시
164+
# - name: Build Prometheus image - release
165+
# if: github.ref == 'refs/heads/release'
166+
# id: build-prom-image-release
167+
# run: |
168+
# cp config/prod/application-prometheus-prod.yml ./prometheus.yml
169+
# docker build --platform linux/amd64 -f monitoring/Dockerfile -t ${{ secrets.ECR_REPO_NAME_PROMETHEUS_PROD }} .
170+
# docker tag ${{ secrets.ECR_REPO_NAME_PROMETHEUS_PROD }}:latest ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.ap-northeast-2.amazonaws.com/${{ secrets.ECR_REPO_NAME_PROMETHEUS_PROD }}:latest
171+
# docker push ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.ap-northeast-2.amazonaws.com/${{ secrets.ECR_REPO_NAME_PROMETHEUS_PROD }}:latest
172+
# echo "image=${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.ap-northeast-2.amazonaws.com/${{ secrets.ECR_REPO_NAME_PROMETHEUS_PROD }}:latest" >> $GITHUB_OUTPUT
173+
#
174+
# - name: Build Prometheus image - develop
175+
# if: github.ref == 'refs/heads/develop'
176+
# id: build-prom-image-develop
177+
# run: |
178+
# cp config/dev/application-prometheus-dev.yml ./prometheus.yml
179+
# docker build --platform linux/amd64 -f monitoring/Dockerfile -t ${{ secrets.ECR_REPO_NAME_PROMETHEUS_DEV }} .
180+
# docker tag ${{ secrets.ECR_REPO_NAME_PROMETHEUS_DEV }}:latest ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.ap-northeast-2.amazonaws.com/${{ secrets.ECR_REPO_NAME_PROMETHEUS_DEV }}:latest
181+
# docker push ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.ap-northeast-2.amazonaws.com/${{ secrets.ECR_REPO_NAME_PROMETHEUS_DEV }}:latest
182+
# echo "image=${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.ap-northeast-2.amazonaws.com/${{ secrets.ECR_REPO_NAME_PROMETHEUS_DEV }}:latest" >> $GITHUB_OUTPUT
183183

184184
# 9. Amazon ECS 태스크 정의에 새 이미지 ID 채우기
185185
- name: Fill in the new image ID in the Amazon ECS task definition - release
@@ -191,22 +191,22 @@ jobs:
191191
container-name: ${{ secrets.ECS_CONTAINER_NAME_PROD }}
192192
image: ${{ steps.build-image-release.outputs.image }}
193193

194-
# ★ 추가: 프로메테우스 이미지 주입 (release)
195-
- name: Fill in Prometheus image - release
196-
if: github.ref == 'refs/heads/release'
197-
id: task-def-prom-release
198-
uses: aws-actions/amazon-ecs-render-task-definition@v1
199-
with:
200-
task-definition: ${{ steps.task-def-release.outputs.task-definition }} # 위 단계에서 만든 결과물을 입력으로 사용
201-
container-name: prometheus
202-
image: ${{ steps.build-prom-image-release.outputs.image }}
203-
204-
- name: Mask ECS container name secret - release
205-
if: github.ref == 'refs/heads/release'
206-
run: |
207-
echo "ECS_CONTAINER_NAME_PROD is ${{ secrets.ECS_CONTAINER_NAME_PROD }}"
208-
echo "Container Names in task-definition-prod.json:"
209-
cat task-definition-prod.json | jq -r '.containerDefinitions[].name'
194+
# # ★ 추가: 프로메테우스 이미지 주입 (release)
195+
# - name: Fill in Prometheus image - release
196+
# if: github.ref == 'refs/heads/release'
197+
# id: task-def-prom-release
198+
# uses: aws-actions/amazon-ecs-render-task-definition@v1
199+
# with:
200+
# task-definition: ${{ steps.task-def-release.outputs.task-definition }} # 위 단계에서 만든 결과물을 입력으로 사용
201+
# container-name: prometheus
202+
# image: ${{ steps.build-prom-image-release.outputs.image }}
203+
#
204+
# - name: Mask ECS container name secret - release
205+
# if: github.ref == 'refs/heads/release'
206+
# run: |
207+
# echo "ECS_CONTAINER_NAME_PROD is ${{ secrets.ECS_CONTAINER_NAME_PROD }}"
208+
# echo "Container Names in task-definition-prod.json:"
209+
# cat task-definition-prod.json | jq -r '.containerDefinitions[].name'
210210

211211
- name: Fill in the new image ID in the Amazon ECS task definition - develop
212212
if: github.ref == 'refs/heads/develop'
@@ -217,22 +217,22 @@ jobs:
217217
container-name: ${{ secrets.ECS_CONTAINER_NAME_DEV }}
218218
image: ${{ steps.build-image-develop.outputs.image }}
219219

220-
# ★ 추가: 프로메테우스 이미지 주입 (develop)
221-
- name: Fill in Prometheus image - develop
222-
if: github.ref == 'refs/heads/develop'
223-
id: task-def-prom-develop
224-
uses: aws-actions/amazon-ecs-render-task-definition@v1
225-
with:
226-
task-definition: ${{ steps.task-def-develop.outputs.task-definition }} # 위 단계에서 만든 결과물을 입력으로 사용
227-
container-name: prometheus
228-
image: ${{ steps.build-prom-image-develop.outputs.image }}
220+
# # ★ 추가: 프로메테우스 이미지 주입 (develop)
221+
# - name: Fill in Prometheus image - develop
222+
# if: github.ref == 'refs/heads/develop'
223+
# id: task-def-prom-develop
224+
# uses: aws-actions/amazon-ecs-render-task-definition@v1
225+
# with:
226+
# task-definition: ${{ steps.task-def-develop.outputs.task-definition }} # 위 단계에서 만든 결과물을 입력으로 사용
227+
# container-name: prometheus
228+
# image: ${{ steps.build-prom-image-develop.outputs.image }}
229229

230230
# 10. ECS에 배포
231231
- name: Deploy to ECS - release
232232
if: github.ref == 'refs/heads/release'
233233
uses: aws-actions/amazon-ecs-deploy-task-definition@v1
234234
with:
235-
task-definition: ${{ steps.task-def-prom-release.outputs.task-definition }} # ECS 태스크 정의 파일을 지정합니다.
235+
task-definition: ${{ steps.task-def-release.outputs.task-definition }} # ECS 태스크 정의 파일을 지정합니다.
236236
service: ${{ secrets.ECS_SERVICE_NAME_PROD }}
237237
cluster: ${{ secrets.ECS_CLUSTER_NAME }}
238238
wait-for-service-stability: true # 서비스가 안정화될 때까지 대기합니다.
@@ -241,7 +241,7 @@ jobs:
241241
if: github.ref == 'refs/heads/develop'
242242
uses: aws-actions/amazon-ecs-deploy-task-definition@v1
243243
with:
244-
task-definition: ${{ steps.task-def-prom-develop.outputs.task-definition }} # ECS 태스크 정의 파일을 지정합니다.
244+
task-definition: ${{ steps.task-def-develop.outputs.task-definition }} # ECS 태스크 정의 파일을 지정합니다.
245245
service: ${{ secrets.ECS_SERVICE_NAME_DEV }}
246246
cluster: ${{ secrets.ECS_CLUSTER_NAME }}
247247
wait-for-service-stability: true # 서비스가 안정화될 때까지 대기합니다.

0 commit comments

Comments
 (0)