Use 0.0.0.0 like docker compose did

grafana · Nov 6, 2023 · ea9ca9e · ea9ca9e
1 parent ca1aa08
commit ea9ca9e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/GNUmakefile b/GNUmakefile
@@ -23,7 +23,7 @@ testacc-oss-docker:
 	GRAFANA_VERSION=$(GRAFANA_VERSION) docker compose up --force-recreate --detach --remove-orphans --wait
 
 	GRAFANA_VERSION=$(GRAFANA_VERSION) \
-	GRAFANA_URL="http://127.0.0.1:3000" \
+	GRAFANA_URL="http://0.0.0.0:3000" \
 	GRAFANA_AUTH="admin:admin" \
 	make testacc-oss
 
@@ -33,7 +33,7 @@ testacc-enterprise-docker:
 	GRAFANA_IMAGE=grafana/grafana-enterprise GRAFANA_VERSION=$(GRAFANA_VERSION) docker compose up --force-recreate --detach --remove-orphans --wait
 
 	GRAFANA_VERSION=$(GRAFANA_VERSION) \
-	GRAFANA_URL="http://127.0.0.1:3000" \
+	GRAFANA_URL="http://0.0.0.0:3000" \
 	GRAFANA_AUTH="admin:admin" \
 	make testacc-enterprise
 
@@ -44,7 +44,7 @@ testacc-tls-docker:
 	GRAFANA_VERSION=$(GRAFANA_VERSION) docker compose --profile tls up --force-recreate --detach --remove-orphans --wait
 
 	GRAFANA_VERSION=$(GRAFANA_VERSION) \
-	GRAFANA_URL="https://127.0.0.1:3001" \
+	GRAFANA_URL="http://0.0.0.0:3000" \
 	GRAFANA_AUTH="admin:admin" \
 	GRAFANA_TLS_KEY=$$(pwd)/testdata/client.key \
     GRAFANA_TLS_CERT=$$(pwd)/testdata/client.crt \
@@ -57,7 +57,7 @@ testacc-subpath-docker:
 	GRAFANA_VERSION=$(GRAFANA_VERSION) GRAFANA_SUBPATH=/grafana/ GF_SERVER_SERVE_FROM_SUB_PATH=true docker compose up --force-recreate --detach --remove-orphans --wait
 
 	GRAFANA_VERSION=$(GRAFANA_VERSION) \
-	GRAFANA_URL="http://127.0.0.1:3000/grafana" \
+	GRAFANA_URL="http://0.0.0.0:3000/grafana" \
 	GRAFANA_AUTH="admin:admin" \
 	make testacc-oss
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -5,11 +5,11 @@ services:
       - 3000:3000
     image: ${GRAFANA_IMAGE:-grafana/grafana}:${GRAFANA_VERSION}
     environment:
-      - GF_SERVER_ROOT_URL=http://127.0.0.1:3000${GRAFANA_SUBPATH:-}
+      - GF_SERVER_ROOT_URL=http://0.0.0.0:3000${GRAFANA_SUBPATH:-}
       - GF_ENTERPRISE_LICENSE_TEXT=${GF_ENTERPRISE_LICENSE_TEXT:-}
       - GF_SERVER_SERVE_FROM_SUB_PATH=${GF_SERVER_SERVE_FROM_SUB_PATH:-}
     healthcheck:
-      test: wget --no-verbose --tries=1 --spider http://127.0.0.1:3000${GRAFANA_SUBPATH:-}/api/health || exit 1 # Use wget because older versions of Grafana don't have curl
+      test: wget --no-verbose --tries=1 --spider http://0.0.0.0:3000${GRAFANA_SUBPATH:-}/api/health || exit 1 # Use wget because older versions of Grafana don't have curl
       interval: 10s
       retries: 10
       start_period: 10s