Skip to content

fix: SSH ProxyJump 문법을 -o 옵션에서 -J 플래그로 변경 #57

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.

Sign up for GitHub

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

Merged
Woomin-Wang merged 12 commits into from
Apr 22, 2026
Merged

fix: SSH ProxyJump 문법을 -o 옵션에서 -J 플래그로 변경 #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
556c90e
chore: Github Actions CI/CD 파이프라인 구축
Woomin-Wang Apr 21, 2026
f31714c
fix: 테스트 코드 제거
Woomin-Wang Apr 21, 2026
be9c0fe
fix: JPA 설정 update로 변경
Woomin-Wang Apr 21, 2026
8d9fc70
fix: JPA 설정 update로 변경
Woomin-Wang Apr 21, 2026
aaad966
fix: CI 테스트 프로파일용 application-test.yml 추가
Woomin-Wang Apr 21, 2026
6b4a3e6
fix: CI/CD 이미지명, 경로, health check 엔드포인트 수정
Woomin-Wang Apr 22, 2026
af503b8
fix: CI/CD 이미지명, 경로, health check 엔드포인트 수정
Woomin-Wang Apr 22, 2026
0cd2329
fix: docker-compose.prod.yml 경로 및 서버 설정 동기화
Woomin-Wang Apr 22, 2026
ee0967c
fix: docker-compose.prod.yml 경로 및 서버 설정 동기화
Woomin-Wang Apr 22, 2026
08e323a
fix: docker-compose.prod.yml 경로 및 서버 설정 동기화
Woomin-Wang Apr 22, 2026
5515d84
fix: docker-compose.prod.yml fluentbit 경로 서버 구조에 맞게 수정
Woomin-Wang Apr 22, 2026
dce4d41
fix: SSH ProxyJump 문법을 -o 옵션에서 -J 플래그로 변경
Woomin-Wang Apr 22, 2026
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
10 changes: 5 additions & 5 deletions .github/workflows/cd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
GHCR_PAT: ${{ secrets.GHCR_PAT }}
GITHUB_ACTOR: ${{ github.actor }}
run: |
ssh -o StrictHostKeyChecking=no -o ProxyJump=$JUMP_USER@$JUMP_HOST:$JUMP_PORT $TARGET_USER@$TARGET_HOST /bin/bash << ENDSSH
ssh -o StrictHostKeyChecking=no -J "${JUMP_USER}@${JUMP_HOST}:${JUMP_PORT}" "${TARGET_USER}@${TARGET_HOST}" /bin/bash << ENDSSH
set -e

echo "=== 배포 디렉토리 이동 ==="
Expand All @@ -49,10 +49,10 @@ jobs:
echo "$GHCR_PAT" | docker login ghcr.io -u "$GITHUB_ACTOR" --password-stdin

echo "=== 최신 이미지 Pull ==="
docker compose -f docker-compose-prod.yml --env-file .env pull app
docker compose -f docker/docker-compose.prod.yml --env-file .env pull app

echo "=== 앱 컨테이너 재시작 ==="
docker compose -f docker-compose-prod.yml --env-file .env up -d app
docker compose -f docker/docker-compose.prod.yml --env-file .env up -d app

echo "=== Health Check (최대 60초) ==="
for i in \$(seq 1 12); do
Expand All @@ -65,7 +65,7 @@ jobs:
done

echo "Health check 실패"
docker compose -f docker-compose-prod.yml logs --tail=50 app
docker compose -f docker/docker-compose.prod.yml logs --tail=50 app
exit 1
ENDSSH

Expand All @@ -78,6 +78,6 @@ jobs:
TARGET_HOST: ${{ secrets.RASPI_TARGET_HOST }}
TARGET_USER: ${{ secrets.RASPI_TARGET_USER }}
run: |
ssh -o StrictHostKeyChecking=no -o ProxyJump=$JUMP_USER@$JUMP_HOST:$JUMP_PORT $TARGET_USER@$TARGET_HOST /bin/bash << ENDSSH
ssh -o StrictHostKeyChecking=no -J "${JUMP_USER}@${JUMP_HOST}:${JUMP_PORT}" "${TARGET_USER}@${TARGET_HOST}" /bin/bash << ENDSSH
docker image prune -af --filter "until=72h" || true
ENDSSH
4 changes: 2 additions & 2 deletions docker/docker-compose.prod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ services:
image: fluent/fluent-bit:3.2
container_name: interview-fluent-bit
volumes:
- ./fluent-bit/fluent-bit.conf:/fluent-bit/etc/fluent-bit.conf:ro
- ./fluent-bit/parsers.conf:/fluent-bit/etc/parsers.conf:ro
- ../fluentbit/fluent-bit.conf:/fluent-bit/etc/fluent-bit.conf:ro
- ../fluentbit/parsers.conf:/fluent-bit/etc/parsers.conf:ro
Comment on lines +6 to +7
Copy link
Copy Markdown

@gemini-code-assist gemini-code-assist Bot Apr 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

볼륨 경로가 ../fluentbit/로 변경되었으나, 이는 실제 파일 위치인 docker/fluent-bit/와 일치하지 않는 오류입니다. docker/docker-compose.prod.yml 파일의 위치를 기준으로 할 때 기존의 ./fluent-bit/ 경로가 올바르며, 현재 변경 사항은 컨테이너 실행 실패를 초래합니다. 또한, PR 제목(SSH ProxyJump 관련)과 실제 변경 내용이 서로 일치하지 않습니다.

      - ./fluent-bit/fluent-bit.conf:/fluent-bit/etc/fluent-bit.conf:ro
      - ./fluent-bit/parsers.conf:/fluent-bit/etc/parsers.conf:ro

ports:
- "24224:24224"
environment:
Expand Down
Loading