diff --git a/docker-compose.dev-ci.yml b/docker-compose.dev-ci.yml index 26ee2855..9dec81d5 100644 --- a/docker-compose.dev-ci.yml +++ b/docker-compose.dev-ci.yml @@ -1,5 +1,7 @@ version: '3.9' - + + + services: web: container_name: web @@ -9,7 +11,7 @@ services: image: ghcr.io/procollab-github/api:latest restart: always volumes: - - log:/procollab/log + - ./log:/procollab/log env_file: - .env environment: @@ -35,20 +37,6 @@ services: volumes: - prom-data:/prometheus - ./prometheus:/etc/prometheus - node-exporter: - container_name: node-exporter - image: prom/node-exporter:v1.3.1 - expose: - - 9100 - volumes: - - /proc:/host/proc:ro - - /sys:/host/sys:ro - - /:/rootfs:ro - command: - - '--path.procfs=/host/proc' - - '--path.sysfs=/host/sys' - - '--collector.filesystem.mount-points-exclude' - - '^/(sys|proc|dev|host|etc|rootfs/var/lib/docker/containers|rootfs/var/lib/docker/overlay2|rootfs/run/docker/netns|rootfs/var/lib/docker/aufs)($$|/)' nginx: container_name: nginx build: ./nginx @@ -56,6 +44,18 @@ services: - web ports: - 8000:80 + loki: + image: grafana/loki:2.9.0 + ports: + - "3100:3100" + command: -config.file=/etc/loki/local-config.yaml + promtail: + image: grafana/promtail:2.9.0 + volumes: + - /var/log:/var/log + - ./promtail:/etc/promtail + - ./log:/procollab/log + command: -config.file=/etc/promtail/config.yml redis: container_name: redis @@ -64,11 +64,11 @@ services: - 6379 volumes: - redis-data:/data - volumes: grafana-data: grafana-configs: prom-data: prom-configs: log: + promtail: redis-data: