From b863bdd914c3fb2448f52058e66724a4096b16f5 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Thu, 22 May 2025 17:39:34 +0200 Subject: [PATCH] [bitnami/influxdb] Release 3.0.3-debian-12-r3 (#81451) Signed-off-by: Bitnami Bot --- bitnami/influxdb/3/debian-12/Dockerfile | 6 +++--- .../prebuildfs/opt/bitnami/.bitnami_components.json | 2 +- .../debian-12/rootfs/opt/bitnami/scripts/influxdb/setup.sh | 2 +- .../3/debian-12/rootfs/opt/bitnami/scripts/libinfluxdb.sh | 7 ++++--- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/bitnami/influxdb/3/debian-12/Dockerfile b/bitnami/influxdb/3/debian-12/Dockerfile index 7b2189fdbada..f05c67d4220d 100644 --- a/bitnami/influxdb/3/debian-12/Dockerfile +++ b/bitnami/influxdb/3/debian-12/Dockerfile @@ -8,10 +8,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2025-05-21T13:32:21Z" \ + org.opencontainers.image.created="2025-05-22T15:15:04Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/influxdb/README.md" \ - org.opencontainers.image.ref.name="3.0.3-debian-12-r2" \ + org.opencontainers.image.ref.name="3.0.3-debian-12-r3" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/influxdb" \ org.opencontainers.image.title="influxdb" \ org.opencontainers.image.vendor="Broadcom, Inc." \ @@ -29,7 +29,7 @@ RUN install_packages ca-certificates curl jq libbz2-1.0 libcom-err2 libcrypt1 li RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \ COMPONENTS=( \ "python-3.12.10-14-linux-${OS_ARCH}-debian-12" \ - "influxdb-3.0.3-0-linux-${OS_ARCH}-debian-12" \ + "influxdb-3.0.3-1-linux-${OS_ARCH}-debian-12" \ "wait-for-port-1.0.8-16-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ diff --git a/bitnami/influxdb/3/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/influxdb/3/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json index dfdc279cf7c9..c8bcede17da8 100644 --- a/bitnami/influxdb/3/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/influxdb/3/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,7 +3,7 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "3.0.3-0" + "version": "3.0.3-1" }, "python": { "arch": "amd64", diff --git a/bitnami/influxdb/3/debian-12/rootfs/opt/bitnami/scripts/influxdb/setup.sh b/bitnami/influxdb/3/debian-12/rootfs/opt/bitnami/scripts/influxdb/setup.sh index 81f2308b6a0b..e0dc2a57503a 100755 --- a/bitnami/influxdb/3/debian-12/rootfs/opt/bitnami/scripts/influxdb/setup.sh +++ b/bitnami/influxdb/3/debian-12/rootfs/opt/bitnami/scripts/influxdb/setup.sh @@ -20,7 +20,7 @@ set -o pipefail # Ensure InfluxDB environment variables are valid influxdb_validate # Ensure InfluxDB user and group exist when running as 'root' -if am_i_root; then +if am_i_root && ! is_influxdb_3; then chown -R "$INFLUXDB_DAEMON_USER" "$INFLUXDB_VOLUME_DIR" "$INFLUXDB_CONF_DIR" fi # Ensure InfluxDB is stopped when this script ends. diff --git a/bitnami/influxdb/3/debian-12/rootfs/opt/bitnami/scripts/libinfluxdb.sh b/bitnami/influxdb/3/debian-12/rootfs/opt/bitnami/scripts/libinfluxdb.sh index 2723f57ca4fb..01968054e63f 100644 --- a/bitnami/influxdb/3/debian-12/rootfs/opt/bitnami/scripts/libinfluxdb.sh +++ b/bitnami/influxdb/3/debian-12/rootfs/opt/bitnami/scripts/libinfluxdb.sh @@ -26,6 +26,7 @@ # true/false ######################### is_influxdb_3() { + [[ -z "${APP_VERSION:-}" ]] && return 0 local -r major_version="$(get_sematic_version "$APP_VERSION" 1)" if [[ "$major_version" -eq 3 ]]; then return 0 @@ -114,11 +115,10 @@ influxdb_validate() { } # Boolean validations - for var in "INFLUXDB_CREATE_USER_TOKEN" "INFLUXDB_CREATE_ADMIN_TOKEN" "INFLUXDB_REPORTING_DISABLED" "INFLUXDB_HTTP_AUTH_ENABLED"; do - check_yes_no_value "$var" - done + check_yes_no_value "INFLUXDB_HTTP_AUTH_ENABLED" if is_influxdb_3; then + check_yes_no_value "INFLUXDB_CREATE_ADMIN_TOKEN" if [[ -z "$INFLUXDB_NODE_ID" ]]; then print_validation_error "Node ID is required. Please, specify it by setting the 'INFLUXDB_NODE_ID' environment variable." fi @@ -141,6 +141,7 @@ influxdb_validate() { fi else # InfluxDB 2.x authentication validations + check_yes_no_value "INFLUXDB_CREATE_USER_TOKEN" "INFLUXDB_REPORTING_DISABLED" if [[ -z "${INFLUXDB_ADMIN_USER_PASSWORD:-}" ]]; then print_validation_error "Admin authentication is required. Please, specify a password for the ${INFLUXDB_ADMIN_USER} user by setting the 'INFLUXDB_ADMIN_USER_PASSWORD' or 'INFLUXDB_ADMIN_USER_PASSWORD_FILE' environment variables." fi