From c8b4839fbcf8399289280691c033b1f2711ddea2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Rodr=C3=ADguez=20Hern=C3=A1ndez?= Date: Tue, 22 Sep 2026 15:15:59 +0200 Subject: [PATCH] Deprecate grafana-k6 2.2 (#97728) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Carlos Rodríguez Hernández ai-assisted=no --- bitnami/grafana-k6/2.2/debian-12/Dockerfile | 55 ------------------- ....2.0-4-linux-amd64-debian-12.tar.gz.sha256 | 1 - ....2.0-4-linux-arm64-debian-12.tar.gz.sha256 | 1 - ...1.17-0-linux-amd64-debian-12.tar.gz.sha256 | 1 - ...1.17-0-linux-arm64-debian-12.tar.gz.sha256 | 1 - .../opt/bitnami/licenses/licenses.txt | 2 - .../prebuildfs/usr/sbin/install_packages | 27 --------- .../debian-12/prebuildfs/usr/sbin/run-script | 24 -------- .../prebuildfs/usr/sbin/uninstall_packages | 26 --------- 9 files changed, 138 deletions(-) delete mode 100644 bitnami/grafana-k6/2.2/debian-12/Dockerfile delete mode 100644 bitnami/grafana-k6/2.2/debian-12/prebuildfs/opt/bitnami/checksums/grafana-k6-2.2.0-4-linux-amd64-debian-12.tar.gz.sha256 delete mode 100644 bitnami/grafana-k6/2.2/debian-12/prebuildfs/opt/bitnami/checksums/grafana-k6-2.2.0-4-linux-arm64-debian-12.tar.gz.sha256 delete mode 100644 bitnami/grafana-k6/2.2/debian-12/prebuildfs/opt/bitnami/checksums/scuttle-1.1.17-0-linux-amd64-debian-12.tar.gz.sha256 delete mode 100644 bitnami/grafana-k6/2.2/debian-12/prebuildfs/opt/bitnami/checksums/scuttle-1.1.17-0-linux-arm64-debian-12.tar.gz.sha256 delete mode 100644 bitnami/grafana-k6/2.2/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt delete mode 100755 bitnami/grafana-k6/2.2/debian-12/prebuildfs/usr/sbin/install_packages delete mode 100755 bitnami/grafana-k6/2.2/debian-12/prebuildfs/usr/sbin/run-script delete mode 100755 bitnami/grafana-k6/2.2/debian-12/prebuildfs/usr/sbin/uninstall_packages diff --git a/bitnami/grafana-k6/2.2/debian-12/Dockerfile b/bitnami/grafana-k6/2.2/debian-12/Dockerfile deleted file mode 100644 index 3c03e9ed44b0..000000000000 --- a/bitnami/grafana-k6/2.2/debian-12/Dockerfile +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright Broadcom, Inc. All Rights Reserved. -# SPDX-License-Identifier: APACHE-2.0 - -FROM docker.io/bitnami/minideb:bookworm - -ARG DOWNLOADS_URL="https://downloads.bitnami.com/files/stacksmith" -ARG TARGETARCH - -LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2026-09-13T00:34:21Z" \ - org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ - org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/grafana-k6/README.md" \ - org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/grafana-k6" \ - org.opencontainers.image.title="grafana-k6" \ - org.opencontainers.image.vendor="Broadcom, Inc." \ - org.opencontainers.image.version="2.2.0" - -ENV HOME="/" \ - OS_ARCH="${TARGETARCH:-amd64}" \ - OS_FLAVOUR="debian-12" \ - OS_NAME="linux" - -COPY prebuildfs / -SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] -# Install required system packages and dependencies -RUN install_packages ca-certificates curl procps -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=( \ - "grafana-k6-2.2.0-4-linux-${OS_ARCH}-debian-12" \ - "scuttle-1.1.17-0-linux-${OS_ARCH}-debian-12" \ - ) ; \ - for COMPONENT in "${COMPONENTS[@]}"; do \ - if [ ! -f "${COMPONENT}.tar.gz" ]; then \ - curl -SsLf "${DOWNLOADS_URL}/${COMPONENT}.tar.gz" -O ; \ - fi ; \ - sha256sum -c "/opt/bitnami/checksums/${COMPONENT}.tar.gz.sha256" ; \ - tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner ; \ - rm -rf "${COMPONENT}".tar.gz ; \ - done ; \ - rm -rf /opt/bitnami/checksums ; -RUN apt-get update && apt-get upgrade -y && \ - apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives -RUN useradd -r -u 1001 -g root grafana-k6 -RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true -RUN uninstall_packages curl - -ENV APP_VERSION="2.2.0" \ - BITNAMI_APP_NAME="grafana-k6" \ - IMAGE_REVISION="5" \ - PATH="/opt/bitnami/grafana-k6/bin:/opt/bitnami/common/bin:$PATH" - -USER 1001 -ENTRYPOINT [ "/opt/bitnami/grafana-k6/bin/k6" ] diff --git a/bitnami/grafana-k6/2.2/debian-12/prebuildfs/opt/bitnami/checksums/grafana-k6-2.2.0-4-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/grafana-k6/2.2/debian-12/prebuildfs/opt/bitnami/checksums/grafana-k6-2.2.0-4-linux-amd64-debian-12.tar.gz.sha256 deleted file mode 100644 index 85d4356e2786..000000000000 --- a/bitnami/grafana-k6/2.2/debian-12/prebuildfs/opt/bitnami/checksums/grafana-k6-2.2.0-4-linux-amd64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -dfaa1d41e1b803396d58572ed1fe98665bf2e9d00caa73b5afd361456790fff8 grafana-k6-2.2.0-4-linux-amd64-debian-12.tar.gz diff --git a/bitnami/grafana-k6/2.2/debian-12/prebuildfs/opt/bitnami/checksums/grafana-k6-2.2.0-4-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/grafana-k6/2.2/debian-12/prebuildfs/opt/bitnami/checksums/grafana-k6-2.2.0-4-linux-arm64-debian-12.tar.gz.sha256 deleted file mode 100644 index 7dbf7358f461..000000000000 --- a/bitnami/grafana-k6/2.2/debian-12/prebuildfs/opt/bitnami/checksums/grafana-k6-2.2.0-4-linux-arm64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -2b3bc666d6edf338b3fbe0ebf65b54bfe6e90a652b82e3e4904aac1c63cc6b14 grafana-k6-2.2.0-4-linux-arm64-debian-12.tar.gz diff --git a/bitnami/grafana-k6/2.2/debian-12/prebuildfs/opt/bitnami/checksums/scuttle-1.1.17-0-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/grafana-k6/2.2/debian-12/prebuildfs/opt/bitnami/checksums/scuttle-1.1.17-0-linux-amd64-debian-12.tar.gz.sha256 deleted file mode 100644 index f734546beec8..000000000000 --- a/bitnami/grafana-k6/2.2/debian-12/prebuildfs/opt/bitnami/checksums/scuttle-1.1.17-0-linux-amd64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -cd7e3288199bd61da84f28470acce295c290148671c840a94548768b2e45d89c scuttle-1.1.17-0-linux-amd64-debian-12.tar.gz diff --git a/bitnami/grafana-k6/2.2/debian-12/prebuildfs/opt/bitnami/checksums/scuttle-1.1.17-0-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/grafana-k6/2.2/debian-12/prebuildfs/opt/bitnami/checksums/scuttle-1.1.17-0-linux-arm64-debian-12.tar.gz.sha256 deleted file mode 100644 index a1226bf2f372..000000000000 --- a/bitnami/grafana-k6/2.2/debian-12/prebuildfs/opt/bitnami/checksums/scuttle-1.1.17-0-linux-arm64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -32191d1a788bac3490aa8756824a75c7bad823f541f80298a04a02124a47384b scuttle-1.1.17-0-linux-arm64-debian-12.tar.gz diff --git a/bitnami/grafana-k6/2.2/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt b/bitnami/grafana-k6/2.2/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt deleted file mode 100644 index 76956b38e82c..000000000000 --- a/bitnami/grafana-k6/2.2/debian-12/prebuildfs/opt/bitnami/licenses/licenses.txt +++ /dev/null @@ -1,2 +0,0 @@ -Bitnami containers ship with software bundles. You can find the licenses under: -/opt/bitnami/[name-of-bundle]/licenses/[bundle-version].txt diff --git a/bitnami/grafana-k6/2.2/debian-12/prebuildfs/usr/sbin/install_packages b/bitnami/grafana-k6/2.2/debian-12/prebuildfs/usr/sbin/install_packages deleted file mode 100755 index ccce248b2d14..000000000000 --- a/bitnami/grafana-k6/2.2/debian-12/prebuildfs/usr/sbin/install_packages +++ /dev/null @@ -1,27 +0,0 @@ -#!/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 update -qq && - apt-get install -y --no-install-recommends "$@" - ) - 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/grafana-k6/2.2/debian-12/prebuildfs/usr/sbin/run-script b/bitnami/grafana-k6/2.2/debian-12/prebuildfs/usr/sbin/run-script deleted file mode 100755 index 0e07c9038dfd..000000000000 --- a/bitnami/grafana-k6/2.2/debian-12/prebuildfs/usr/sbin/run-script +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# Copyright Broadcom, Inc. All Rights Reserved. -# SPDX-License-Identifier: APACHE-2.0 -set -u - -if [ $# -eq 0 ]; then - >&2 echo "No arguments provided" - exit 1 -fi - -script=$1 -exit_code="${2:-96}" -fail_if_not_present="${3:-n}" - -if test -f "$script"; then - sh $script - - if [ $? -ne 0 ]; then - exit $((exit_code)) - fi -elif [ "$fail_if_not_present" = "y" ]; then - >&2 echo "script not found: $script" - exit 127 -fi diff --git a/bitnami/grafana-k6/2.2/debian-12/prebuildfs/usr/sbin/uninstall_packages b/bitnami/grafana-k6/2.2/debian-12/prebuildfs/usr/sbin/uninstall_packages deleted file mode 100755 index 615c430e4e68..000000000000 --- a/bitnami/grafana-k6/2.2/debian-12/prebuildfs/usr/sbin/uninstall_packages +++ /dev/null @@ -1,26 +0,0 @@ -#!/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