diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 22f8396..278b500 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -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 "=== 배포 디렉토리 이동 ===" @@ -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 @@ -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 @@ -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 diff --git a/docker/docker-compose.prod.yml b/docker/docker-compose.prod.yml index ddde126..a218256 100644 --- a/docker/docker-compose.prod.yml +++ b/docker/docker-compose.prod.yml @@ -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 ports: - "24224:24224" environment: