mirror of
https://github.com/bitnami/containers.git
synced 2026-02-11 14:37:20 +08:00
[bitnami/influxdb] add config file format support / issue 79984 (#79986)
This commit is contained in:
@@ -81,7 +81,8 @@ export INFLUXDB_DATA_WAL_DIR="${INFLUXDB_DATA_WAL_DIR:-${INFLUXDB_VOLUME_DIR}/wa
|
||||
export INFLUXDB_META_DIR="${INFLUXDB_META_DIR:-${INFLUXDB_VOLUME_DIR}/meta}"
|
||||
export INFLUXDB_CONF_DIR="${INFLUXDB_BASE_DIR}/etc"
|
||||
export INFLUXDB_DEFAULT_CONF_DIR="${INFLUXDB_BASE_DIR}/etc.default"
|
||||
export INFLUXDB_CONF_FILE="${INFLUXDB_CONF_DIR}/config.yaml"
|
||||
export INFLUXDB_CONF_FILE_FORMAT="${INFLUXDB_CONF_FILE_FORMAT:-"yaml"}"
|
||||
export INFLUXDB_CONF_FILE="${INFLUXDB_CONF_DIR}/config.${INFLUXDB_CONF_FILE_FORMAT}"
|
||||
export INFLUXDB_INITSCRIPTS_DIR="/docker-entrypoint-initdb.d"
|
||||
|
||||
# InfluxDB 2.x aliases
|
||||
|
||||
@@ -74,6 +74,16 @@ influxdb_validate() {
|
||||
done
|
||||
check_conflicting_ports "${ports_envs[@]}"
|
||||
|
||||
# Validate INFLUXDB_CONF_FILE_FORMAT if set
|
||||
if [[ -n "${INFLUXDB_CONF_FILE_FORMAT:-}" ]]; then
|
||||
case "${INFLUXDB_CONF_FILE_FORMAT}" in
|
||||
yaml|json|yml|toml) ;;
|
||||
*)
|
||||
print_validation_error "The allowed values for INFLUXDB_CONF_FILE_FORMAT are [yaml, json, yml, toml]"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
[[ "$error_code" -eq 0 ]] || exit "$error_code"
|
||||
}
|
||||
|
||||
|
||||
@@ -205,6 +205,7 @@ InfluxDB (TM) can be configured via environment variables or using a configurati
|
||||
| `INFLUXDB_WRITE_USER` | Additional InfluxDB username with write privileges. | `nil` |
|
||||
| `INFLUXDB_WRITE_USER_PASSWORD` | Additional InfluxDB user with write privileges. | `nil` |
|
||||
| `INFLUXDB_DB` | InfluxDB database name. | `nil` |
|
||||
| `INFLUXDB_CONF_FILE_FORMAT` | InfluxDB configuration file format, supported formats: yaml, yml, toml, json | `yaml` |
|
||||
|
||||
#### Read-only environment variables
|
||||
|
||||
|
||||
Reference in New Issue
Block a user