node is host

This commit is contained in:
Yann Autissier
2022-11-29 16:22:35 +00:00
parent 2b20a33133
commit b938dd0ffd
105 changed files with 687 additions and 704 deletions
-6
View File
@@ -1,6 +0,0 @@
GRAFANA_AWS_ACCESS_KEY=${AWS_ACCESS_KEY_ID}
GRAFANA_AWS_SECRET_KEY=${AWS_SECRET_ACCESS_KEY}
GRAFANA_MYSQL_DB=grafana
GRAFANA_MYSQL_PASSWORD=grafana
GRAFANA_MYSQL_USER=grafana
GRAFANA_SERVICE_3000_TAGS=urlprefix-grafana.${APP_DOMAIN}/
+4
View File
@@ -0,0 +1,4 @@
ENV_VARS += GRAFANA_SERVICE_3000_TAGS
GRAFANA_SERVICE_3000_TAGS ?= $(patsubst %,urlprefix-%,$(GRAFANA_SERVICE_3000_URIS))
GRAFANA_SERVICE_3000_URIS ?= $(patsubst %,kibana.%,$(APP_URIS))
+5 -5
View File
@@ -4,12 +4,12 @@ services:
grafana:
build:
args:
- AWS_ACCESS_KEY=${GRAFANA_AWS_ACCESS_KEY}
- AWS_SECRET_KEY=${GRAFANA_AWS_SECRET_KEY}
- AWS_ACCESS_KEY=${GRAFANA_AWS_ACCESS_KEY:-${AWS_ACCESS_KEY_ID}}
- AWS_SECRET_KEY=${GRAFANA_AWS_SECRET_KEY:-${AWS_SECRET_ACCESS_KEY}}
- DOCKER_BUILD_DIR=docker/grafana
- MYSQL_GRAFANA_DB=${GRAFANA_MYSQL_DB}
- MYSQL_GRAFANA_PASSWORD=${GRAFANA_MYSQL_PASSWORD}
- MYSQL_GRAFANA_USER=${GRAFANA_MYSQL_USER}
- MYSQL_GRAFANA_DB=${GRAFANA_MYSQL_GRAFANA_DB:-grafana}
- MYSQL_GRAFANA_PASSWORD=${GRAFANA_MYSQL_GRAFANA_PASSWORD:-grafana}
- MYSQL_GRAFANA_USER=${GRAFANA_MYSQL_GRAFANA_USER:-grafana}
context: ../..
dockerfile: docker/grafana/Dockerfile
environment: