From ef3a772836dbf359d6cc60ad9be72a73e944e7c5 Mon Sep 17 00:00:00 2001 From: Jesse Hallam Date: Mon, 19 Jun 2023 14:01:47 -0300 Subject: [PATCH] Don't start grafana/prometheus by default (#23797) Don't list Prometheus and Grafana as targets in the `start_dependencies` target of the docker compose file used in CI and local development. These can still be started by hand, but will no longer waste resources in CI, nor fail build spuriously if they fail to come online. --- server/build/docker-compose.yml | 4 +--- server/build/gitlab-dc.mysql.yml | 4 +--- server/build/gitlab-dc.postgres.yml | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/server/build/docker-compose.yml b/server/build/docker-compose.yml index f15c1f6ac5..aaecb23faa 100644 --- a/server/build/docker-compose.yml +++ b/server/build/docker-compose.yml @@ -56,9 +56,7 @@ services: - inbucket - openldap - elasticsearch - - prometheus - - grafana - command: postgres:5432 mysql:3306 minio:9000 inbucket:9001 openldap:389 elasticsearch:9200 prometheus:9090 grafana:3000 + command: postgres:5432 mysql:3306 minio:9000 inbucket:9001 openldap:389 elasticsearch:9200 networks: mm-test: diff --git a/server/build/gitlab-dc.mysql.yml b/server/build/gitlab-dc.mysql.yml index 742ee52b7a..a681dbbb70 100644 --- a/server/build/gitlab-dc.mysql.yml +++ b/server/build/gitlab-dc.mysql.yml @@ -90,9 +90,7 @@ services: - inbucket - openldap - elasticsearch - - prometheus - - grafana - command: mysql:3306 minio:9000 inbucket:9001 openldap:389 elasticsearch:9200 prometheus:9090 grafana:3000 + command: mysql:3306 minio:9000 inbucket:9001 openldap:389 elasticsearch:9200 networks: default: diff --git a/server/build/gitlab-dc.postgres.yml b/server/build/gitlab-dc.postgres.yml index ffd91863b8..c27e978d0a 100644 --- a/server/build/gitlab-dc.postgres.yml +++ b/server/build/gitlab-dc.postgres.yml @@ -88,9 +88,7 @@ services: - inbucket - openldap - elasticsearch - - prometheus - - grafana - command: postgres:5432 minio:9000 inbucket:9001 openldap:389 elasticsearch:9200 prometheus:9090 grafana:3000 + command: postgres:5432 minio:9000 inbucket:9001 openldap:389 elasticsearch:9200 networks: default: