From 3a9f091f6a884e2d139d29e98c1c2c97826c5958 Mon Sep 17 00:00:00 2001 From: Bitnami Bot Date: Tue, 24 Jun 2025 17:22:44 +0200 Subject: [PATCH] [bitnami/influxdb] Release 3.2.0-debian-12-r0 (#82547) Signed-off-by: Bitnami Bot --- bitnami/influxdb/3/debian-12/Dockerfile | 18 +++++++------ .../opt/bitnami/.bitnami_components.json | 6 ++--- .../prebuildfs/usr/sbin/uninstall_packages | 26 +++++++++++++++++++ .../bitnami/scripts/influxdb/postunpack.sh | 6 ++--- bitnami/influxdb/3/debian-12/tags-info.yaml | 8 +++--- bitnami/influxdb/README.md | 2 +- 6 files changed, 47 insertions(+), 19 deletions(-) create mode 100755 bitnami/influxdb/3/debian-12/prebuildfs/usr/sbin/uninstall_packages diff --git a/bitnami/influxdb/3/debian-12/Dockerfile b/bitnami/influxdb/3/debian-12/Dockerfile index 1a942c7e283f..2758718c7669 100644 --- a/bitnami/influxdb/3/debian-12/Dockerfile +++ b/bitnami/influxdb/3/debian-12/Dockerfile @@ -8,14 +8,14 @@ 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-30T14:49:59Z" \ + org.opencontainers.image.created="2025-06-24T15:00:17Z" \ 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.1.0-debian-12-r1" \ + org.opencontainers.image.ref.name="3.2.0-debian-12-r0" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/influxdb" \ org.opencontainers.image.title="influxdb" \ org.opencontainers.image.vendor="Broadcom, Inc." \ - org.opencontainers.image.version="3.1.0" + org.opencontainers.image.version="3.2.0" ENV HOME="/" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -26,11 +26,13 @@ COPY prebuildfs / SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] # Install required system packages and dependencies RUN install_packages ca-certificates curl jq libbz2-1.0 libcom-err2 libcrypt1 libffi8 libgcc-s1 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libssl3 libtinfo6 libtirpc3 procps zlib1g -RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \ +RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \ + DOWNLOADS_URL=${SECRET_DOWNLOADS_URL:-${DOWNLOADS_URL}} ; \ + mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \ COMPONENTS=( \ - "python-3.12.10-15-linux-${OS_ARCH}-debian-12" \ - "influxdb-3.1.0-0-linux-${OS_ARCH}-debian-12" \ - "wait-for-port-1.0.8-16-linux-${OS_ARCH}-debian-12" \ + "python-3.12.11-3-linux-${OS_ARCH}-debian-12" \ + "influxdb-3.2.0-0-linux-${OS_ARCH}-debian-12" \ + "wait-for-port-1.0.9-0-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -48,7 +50,7 @@ RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true COPY rootfs / RUN /opt/bitnami/scripts/influxdb/postunpack.sh -ENV APP_VERSION="3.1.0" \ +ENV APP_VERSION="3.2.0" \ BITNAMI_APP_NAME="influxdb" \ LD_LIBRARY_PATH="/opt/bitnami/python/lib:$LD_LIBRARY_PATH" \ PATH="/opt/bitnami/python/bin:/opt/bitnami/influxdb/bin:/opt/bitnami/common/bin:$PATH" 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 75f5c0ad6814..0dbf63288bf0 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,18 +3,18 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "3.1.0-0" + "version": "3.2.0-0" }, "python": { "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "3.12.10-15" + "version": "3.12.11-3" }, "wait-for-port": { "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "1.0.8-16" + "version": "1.0.9-0" } } \ No newline at end of file diff --git a/bitnami/influxdb/3/debian-12/prebuildfs/usr/sbin/uninstall_packages b/bitnami/influxdb/3/debian-12/prebuildfs/usr/sbin/uninstall_packages new file mode 100755 index 000000000000..615c430e4e68 --- /dev/null +++ b/bitnami/influxdb/3/debian-12/prebuildfs/usr/sbin/uninstall_packages @@ -0,0 +1,26 @@ +#!/bin/sh +# Copyright Broadcom, Inc. All Rights Reserved. +# SPDX-License-Identifier: APACHE-2.0 +set -eu + +n=0 +max=2 +export DEBIAN_FRONTEND=noninteractive + +until [ $n -gt $max ]; do + set +e + ( + apt-get autoremove --purge -y "$@" + ) + CODE=$? + set -e + if [ $CODE -eq 0 ]; then + break + fi + if [ $n -eq $max ]; then + exit $CODE + fi + echo "apt failed, retrying" + n=$(($n + 1)) +done +apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives diff --git a/bitnami/influxdb/3/debian-12/rootfs/opt/bitnami/scripts/influxdb/postunpack.sh b/bitnami/influxdb/3/debian-12/rootfs/opt/bitnami/scripts/influxdb/postunpack.sh index 6145576ac387..09f7dd9af35f 100755 --- a/bitnami/influxdb/3/debian-12/rootfs/opt/bitnami/scripts/influxdb/postunpack.sh +++ b/bitnami/influxdb/3/debian-12/rootfs/opt/bitnami/scripts/influxdb/postunpack.sh @@ -15,15 +15,15 @@ ensure_user_exists "$INFLUXDB_DAEMON_USER" --group "$INFLUXDB_DAEMON_GROUP" # Ensure directories used by InfluxDB exist and have proper ownership and permissions dirs_to_exist=("$INFLUXDB_VOLUME_DIR" "$INFLUXDB_INITSCRIPTS_DIR") -! is_influxdb_3 && dirs_to_exist+=("$INFLUXDB_CONF_DIR" "$INFLUXDB_DEFAULT_CONF_DIR") +[[ ! -f "${INFLUXDB_BIN_DIR}/influxdb3" ]] && dirs_to_exist+=("$INFLUXDB_CONF_DIR" "$INFLUXDB_DEFAULT_CONF_DIR") for dir in "${dirs_to_exist[@]}"; do ensure_dir_exists "$dir" chmod -R g+rwX "$dir" chown -R "${INFLUXDB_DAEMON_USER}:root" "$dir" done -if ! is_influxdb_3; then - touch "$HOME/.influx_history" && chmod g+rwX "$HOME/.influx_history" +if [[ ! -f "${INFLUXDB_BIN_DIR}/influxdb3" ]]; then + touch "/.influx_history" && chmod g+rwX "/.influx_history" if ! is_dir_empty "$INFLUXDB_CONF_DIR"; then # Copy all initially generated configuration files to the default directory # (this is to avoid breaking when entrypoint is being overridden) diff --git a/bitnami/influxdb/3/debian-12/tags-info.yaml b/bitnami/influxdb/3/debian-12/tags-info.yaml index 196bb8e1196a..679c69f52d3f 100644 --- a/bitnami/influxdb/3/debian-12/tags-info.yaml +++ b/bitnami/influxdb/3/debian-12/tags-info.yaml @@ -1,5 +1,5 @@ rolling-tags: -- "3" -- 3-debian-12 -- 3.1.0 -- latest + - "3" + - 3-debian-12 + - 3.2.0 + - latest diff --git a/bitnami/influxdb/README.md b/bitnami/influxdb/README.md index 674ad9ab5097..0a3006783ee5 100644 --- a/bitnami/influxdb/README.md +++ b/bitnami/influxdb/README.md @@ -143,7 +143,7 @@ services: networks: - my-network myapp: - image: 'YOUR_APPLICATION_IMAGE' + image: YOUR_APPLICATION_IMAGE networks: - my-network ```