diff --git a/.github/workflows/aws.yml b/.github/workflows/aws.yml index 4d98e4b..947a034 100644 --- a/.github/workflows/aws.yml +++ b/.github/workflows/aws.yml @@ -88,6 +88,7 @@ jobs: SPRING_PROFILE=production GRAFANA_USER=${{ secrets.GRAFANA_USER }} GRAFANA_PASSWORD=${{ secrets.GRAFANA_PASSWORD }} + GF_SERVER_ROOT_URL=${{secrets.GRAFANA_PRODUCTION_ROOT_URL}} EOF # 최신 이미지 풀 & 재기동 @@ -108,7 +109,7 @@ jobs: host: ${{ secrets.SERVER_HOST }} username: ${{ secrets.SERVER_USER }} key: ${{ secrets.SERVER_SSH_KEY }} - source: "./docker/app/docker-compose.yml,./docker/loki/config/config.yml,./docker/promtail/config/config.yml" + source: "./docker/app/docker-compose-dev.yml,./docker/loki/config/config.yml,./docker/promtail/config/config.yml" target: /home/ubuntu/stack - name: Deploy to Dev Server @@ -133,7 +134,8 @@ jobs: SPRING_PROFILE=dev GRAFANA_USER=${{ secrets.GRAFANA_USER }} GRAFANA_PASSWORD=${{ secrets.GRAFANA_PASSWORD }} + GF_SERVER_ROOT_URL=${{secrets.GRAFANA_DEV_ROOT_URL}} EOF - sudo docker compose pull - sudo docker compose up -d --remove-orphans + sudo docker compose -f docker-compose-dev.yml pull + sudo docker compose -f docker-compose-dev.yml up -d --remove-orphans diff --git a/docker/app/docker-compose-dev.yml b/docker/app/docker-compose-dev.yml new file mode 100644 index 0000000..8a42ee7 --- /dev/null +++ b/docker/app/docker-compose-dev.yml @@ -0,0 +1,56 @@ +services: + app: + image: ${REGISTRY}/kindergarten:${APP_TAG} + container_name: kindergarten + ports: + - "8080:8080" + environment: + - SPRING_PROFILES_ACTIVE=${SPRING_PROFILE} + volumes: + - /home/ubuntu/logs:/home/ubuntu/logs + networks: + - backend_network + restart: unless-stopped + + loki: + image: grafana/loki:3.0.0 + command: -config.file=/etc/loki/config.yml + ports: + - "3100:3100" + volumes: + - /home/ubuntu/stack/docker/loki/config:/etc/loki:ro + networks: + - backend_network + restart: unless-stopped + + grafana: + image: grafana/grafana:10.4.4 + ports: + - "127.0.0.1:3000:3000" + volumes: + - grafana-storage:/var/lib/grafana + networks: + - backend_network + restart: unless-stopped + environment: + - GF_SERVER_ROOT_URL=${GF_SERVER_ROOT_URL} + - GF_SERVER_SERVE_FROM_SUB_PATH=true + - GF_SECURITY_ADMIN_USER=${GRAFANA_USER} + - GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_PASSWORD} + + promtail: + image: grafana/promtail:3.0.0 + command: -config.file=/etc/promtail/config.yml + volumes: + - /home/ubuntu/logs:/var/log/app-logs:ro + - /home/ubuntu/stack/docker/promtail/config:/etc/promtail:ro + networks: + - backend_network + restart: unless-stopped + +volumes: + grafana-storage: + +networks: + backend_network: + driver: bridge \ No newline at end of file diff --git a/docker/app/docker-compose.yml b/docker/app/docker-compose.yml index 778d0bd..8a42ee7 100644 --- a/docker/app/docker-compose.yml +++ b/docker/app/docker-compose.yml @@ -33,7 +33,7 @@ services: - backend_network restart: unless-stopped environment: - - GF_SERVER_ROOT_URL=%(protocol)s://%(domain)s/grafana/ + - GF_SERVER_ROOT_URL=${GF_SERVER_ROOT_URL} - GF_SERVER_SERVE_FROM_SUB_PATH=true - GF_SECURITY_ADMIN_USER=${GRAFANA_USER} - GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_PASSWORD}