[fix]충돌 해결

KakaoFunding · Jul 6, 2024 · 3ce3e02 · 3ce3e02
2 parents 827d328 + 7391a90
commit 3ce3e02
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 100 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -89,6 +89,7 @@ services:
     image: grafana/grafana
     container_name: grafana
     restart: always
+    user: "472"
     ports:
       - "3009:3000"
     environment:
@@ -106,26 +107,6 @@ services:
       - "9104:9104"
     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
 volumes:
   grafana-storage:
   prometheus-data:

diff --git a/loki-config.yml b/loki-config.yml
diff --git a/promtail-config.yml b/promtail-config.yml