From ca77de9b76e1601feb90e2c6d12b4b3618df5105 Mon Sep 17 00:00:00 2001 From: Christoph Kluge Date: Wed, 29 Sep 2021 16:39:21 +0200 Subject: [PATCH] complete influxDB v2 Env variables --- docker-compose.yml | 2 ++ php-fpm/Dockerfile | 4 ++++ php-fpm/symfony.pool.conf | 2 ++ 3 files changed, 8 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index a183bd6..6c93d96 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -69,6 +69,8 @@ services: INFLUXDB_PASSWORD: ${INFLUXDB_PASSWORD} INFLUXDB_PORT: ${INFLUXDB_PORT} INFLUXDB_ADMIN_TOKEN: ${INFLUXDB_ADMIN_TOKEN} + INFLUXDB_ORG: ${INFLUXDB_ORG} + INFLUXDB_BUCKET: ${INFLUXDB_BUCKET} APP_ENVIRONMENT: ${APP_ENVIRONMENT} environment: - APP_CLUSTERCOCKPIT_INIT=${APP_CLUSTERCOCKPIT_INIT} diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 838309b..e4378d9 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -68,8 +68,12 @@ ENV LDAP_URL=ldap://cc-ldap ARG INFLUXDB_PORT ARG INFLUXDB_PASSWORD ARG INFLUXDB_ADMIN_TOKEN +ARG INFLUXDB_ORG +ARG INFLUXDB_BUCKET ENV INFLUXDB_URL=http://cc-influxdb:${INFLUXDB_PORT} ENV INFLUXDB_TOKEN=${INFLUXDB_ADMIN_TOKEN} +ENV INFLUXDB_ORG=${INFLUXDB_ORG} +ENV INFLUXDB_BUCKET=${INFLUXDB_BUCKET} ARG LDAP_PASSWORD ENV LDAP_PW=${LDAP_PASSWORD} ARG MYSQL_USER diff --git a/php-fpm/symfony.pool.conf b/php-fpm/symfony.pool.conf index d777104..336b52a 100644 --- a/php-fpm/symfony.pool.conf +++ b/php-fpm/symfony.pool.conf @@ -81,6 +81,8 @@ env[APP_JWT_PRIV_KEY] = $APP_JWT_PRIV_KEY env[APP_DEBUG] = $APP_DEBUG env[INFLUXDB_URL] = $INFLUXDB_URL env[INFLUXDB_TOKEN] = $INFLUXDB_TOKEN +env[INFLUXDB_ORG] = $INFLUXDB_ORG +env[INFLUXDB_BUCKET] = $INFLUXDB_BUCKET env[DATABASE_URL] = $DATABASE_URL env[REDIS_URL] = $REDIS_URL env[LDAP_URL] = $LDAP_URL