diff --git a/.github/workflows/build-deploy.yml b/.github/workflows/build-deploy.yml index 6817cd44f..5d1edbf8f 100644 --- a/.github/workflows/build-deploy.yml +++ b/.github/workflows/build-deploy.yml @@ -3,7 +3,7 @@ run-name: Running on: push: branches: - - deploy # deploy 브런치로 푸쉬했을 때 실행 + - deploy pull_request: branches: - deploy diff --git a/docker-compose.yml b/docker-compose.yml index 55123fc8c..c927b6274 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -107,25 +107,25 @@ services: volumes: - /home/ec2-user/my.cnf:/etc/mysql/my.cnf - loki: - image: grafana/loki:latest - container_name: loki - restart: always - ports: - - "3100:3100" - volumes: - - ./loki-config.yml:/etc/loki/local-config.yaml - - promtail: - image: grafana/promtail:latest - container_name: promtail - restart: always - volumes: - - /var/log:/var/log - - ./promtail-config.yml:/etc/promtail/config.yml - command: -config.file=/etc/promtail/config.yml - environment: - - HOSTNAME=promtail +# loki: +# image: grafana/loki:latest +# container_name: loki +# restart: always +# ports: +# - "3100:3100" +# volumes: +# - ./loki-config.yml:/etc/loki/local-config.yaml +# +# promtail: +# image: grafana/promtail:latest +# container_name: promtail +# restart: always +# volumes: +# - /var/log:/var/log +# - ./promtail-config.yml:/etc/promtail/config.yml +# command: -config.file=/etc/promtail/config.yml +# environment: +# - HOSTNAME=promtail volumes: grafana-storage: prometheus-data: