Merge branch 'deploy' of https://github.com/KakaoFunding/back-end int…

…o deploy
KakaoFunding · Jun 29, 2024 · 204456c · 204456c
2 parents 6c90f4b + 289a66e
commit 204456c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git 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
@@ -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: