Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev 서버의 로그 저장소 변경 #506

Merged
merged 2 commits into from
Aug 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 16 additions & 29 deletions .github/workflows/backend_cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,53 +3,40 @@ name: Backend CD
on:
push:
branches:
- main
- dev/be

jobs:
build:
runs-on: [self-hosted, develop, spring]
runs-on:
- self-hosted
- spring
- ${{ contains(github.ref, 'main') && 'production' || 'develop' }}
steps:
- name: 브랜치명을 통해 개발 환경 알아내기
run: |
cd ${{ secrets.SCRIPT_DIRECTORY }}
bash find-env-by-branch.sh

- name: 체크아웃
uses: actions/checkout@v4

- name: gradle 캐싱
uses: gradle/actions/setup-gradle@v3

- name: bootJar로 jar 파일 생성
run: |
./gradlew bootJar
mv build/libs/*.jar ${{ secrets.WORK_DIRECTORY }}/${{ env.ENVIRONMENT }}
mv build/libs/*.jar ${{ secrets.JAR_DIRECTORY }}
working-directory: ./backend

- name: 클린업
if: always()
run: rm -rf ../2024-code-zap/*

deploy:
needs: build
runs-on: [self-hosted, develop, spring]
runs-on:
- self-hosted
- spring
- ${{ contains(github.ref, 'main') && 'production' || 'develop' }}
steps:
- name: 브랜치명을 통해 개발 환경 알아내기
run: |
cd ${{ secrets.SCRIPT_DIRECTORY }}
bash find-env-by-branch.sh

- name: 실행 프로세스 확인
run: |
cd ${{ secrets.SCRIPT_DIRECTORY }}
bash check-old-pids.sh

- name: 배포 스크립트 실행
run: |
cd ${{ secrets.SCRIPT_DIRECTORY }}
RUNNER_TRACKING_ID="" && bash start.sh ${{ env.ENVIRONMENT }}

- name: 실행 프로세스 확인으로 배포 검증
run: |
cd ${{ secrets.SCRIPT_DIRECTORY }}
bash verify-deploy.sh
cd ${{ secrets.ZAP_DIRECTORY }}
docker compose restart
35 changes: 0 additions & 35 deletions .github/workflows/backend_cd_prod.yml

This file was deleted.

6 changes: 1 addition & 5 deletions backend/src/main/resources/logback-spring.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@
<include resource="logger/logback-spring-local.xml"/>
</springProfile>

<springProfile name="dev-1">
<include resource="logger/logback-spring-dev.xml"/>
</springProfile>

<springProfile name="dev-2">
<springProfile name="dev">
<include resource="logger/logback-spring-dev.xml"/>
</springProfile>

Expand Down
2 changes: 1 addition & 1 deletion backend/src/main/resources/logger/logback-spring-dev.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration scan="true" scanPeriod="5 seconds">

<property name="LOG_FILE_PATH" value="/home/ubuntu/srv/code-zap/dev/spring-log/"/>
<property name="LOG_FILE_PATH" value="/app/log"/>

<include resource="logger/file/info-appender.xml"/>
<include resource="logger/file/warn-appender.xml"/>
Expand Down
Loading