diff --git a/.gitea/workflows/staging_code_pull.yml b/.gitea/workflows/staging_code_pull.yml index 558bdf47..bf9665a3 100644 --- a/.gitea/workflows/staging_code_pull.yml +++ b/.gitea/workflows/staging_code_pull.yml @@ -176,9 +176,6 @@ jobs: cp docker/staging_pull_compose.template.yaml staging_pull_compose.yaml - # Gitea Container Registry 로그인 (grafana-sms-webhook 이미지를 가져오기 위함) - echo "${{ github.token }}" | docker login gitea.hmac.kr -u "${{ github.actor }}" --password-stdin - docker compose -f staging_pull_compose.yaml pull # 코드 변경 반영을 위해 build 수행 (userfront nginx.conf 등) diff --git a/docker/docker-compose.staging.template.yaml b/docker/docker-compose.staging.template.yaml index d5918360..5cee8021 100644 --- a/docker/docker-compose.staging.template.yaml +++ b/docker/docker-compose.staging.template.yaml @@ -108,23 +108,6 @@ services: networks: - baron_net - grafana-sms-webhook: - image: ${SMS_WEBHOOK_IMAGE_NAME:-gitea.hmac.kr/ai-team/grafana-sms-webhook}:${IMAGE_TAG:-latest} - container_name: grafana_sms_webhook - restart: unless-stopped - env_file: - - .env - environment: - - NAVER_CLOUD_ACCESS_KEY=${NAVER_CLOUD_ACCESS_KEY} - - NAVER_CLOUD_SECRET_KEY=${NAVER_CLOUD_SECRET_KEY} - - NAVER_CLOUD_SERVICE_ID=${NAVER_CLOUD_SERVICE_ID} - - NAVER_SENDER_PHONE_NUMBER=${NAVER_SENDER_PHONE_NUMBER} - - MONITOR_RECIPIENT_PHONES=${MONITOR_RECIPIENT_PHONES} - ports: - - "${SMS_WEBHOOK_PORT:-8080}:8080" - networks: - - baron_net - promtail: image: grafana/promtail:2.9.0 container_name: baron_promtail @@ -132,8 +115,8 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock:ro - /var/lib/docker/containers:/var/lib/docker/containers:ro - - ./promtail-config.staging.template.yaml:/etc/promtail/promtail-config.yaml:ro - command: -config.file=/etc/promtail/promtail-config.yaml + - ./docker/promtail-config.staging.template.yaml:/etc/promtail/promtail-config.yaml:ro + command: -config.file=/etc/promtail/promtail-config.yaml -config.expand-env=true environment: - LOKI_URL=${LOKI_URL:-http://loki:3100/loki/api/v1/push} networks: diff --git a/docker/staging_pull_compose.template.yaml b/docker/staging_pull_compose.template.yaml index 0cabb202..c7b4ae5e 100644 --- a/docker/staging_pull_compose.template.yaml +++ b/docker/staging_pull_compose.template.yaml @@ -535,23 +535,6 @@ services: networks: - baron_net - grafana-sms-webhook: - image: ${SMS_WEBHOOK_IMAGE_NAME:-gitea.hmac.kr/ai-team/grafana-sms-webhook}:${IMAGE_TAG:-latest} - container_name: grafana_sms_webhook - restart: unless-stopped - env_file: - - .env - environment: - - NAVER_CLOUD_ACCESS_KEY=${NAVER_CLOUD_ACCESS_KEY} - - NAVER_CLOUD_SECRET_KEY=${NAVER_CLOUD_SECRET_KEY} - - NAVER_CLOUD_SERVICE_ID=${NAVER_CLOUD_SERVICE_ID} - - NAVER_SENDER_PHONE_NUMBER=${NAVER_SENDER_PHONE_NUMBER} - - MONITOR_RECIPIENT_PHONES=${MONITOR_RECIPIENT_PHONES} - ports: - - "${SMS_WEBHOOK_PORT:-8080}:8080" - networks: - - baron_net - promtail: image: grafana/promtail:2.9.0 container_name: baron_promtail @@ -559,8 +542,8 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock:ro - /var/lib/docker/containers:/var/lib/docker/containers:ro - - ./promtail-config.staging.template.yaml:/etc/promtail/promtail-config.yaml:ro - command: -config.file=/etc/promtail/promtail-config.yaml + - ./docker/promtail-config.staging.template.yaml:/etc/promtail/promtail-config.yaml:ro + command: -config.file=/etc/promtail/promtail-config.yaml -config.expand-env=true environment: - LOKI_URL=${LOKI_URL:-http://loki:3100/loki/api/v1/push} networks: