diff --git a/bitnami/grafana/13.0/debian-12/Dockerfile b/bitnami/grafana/13.0/debian-12/Dockerfile index 3637f0b03ed9..1a6e4f45f348 100644 --- a/bitnami/grafana/13.0/debian-12/Dockerfile +++ b/bitnami/grafana/13.0/debian-12/Dockerfile @@ -3,11 +3,11 @@ FROM docker.io/bitnami/minideb:bookworm -ARG DOWNLOADS_URL="downloads.bitnami.com/files/stacksmith" +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-06-05T10:44:20Z" \ + org.opencontainers.image.created="2026-06-10T19:10:19Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/grafana/README.md" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/grafana" \ @@ -28,13 +28,13 @@ 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=( \ - "mysql-client-12.3.2-0-linux-${OS_ARCH}-debian-12" \ - "ini-file-1.4.9-11-linux-${OS_ARCH}-debian-12" \ - "grafana-13.0.2-1-linux-${OS_ARCH}-debian-12" \ + "mysql-client-12.3.2-1-linux-${OS_ARCH}-debian-12" \ + "ini-file-1.4.9-12-linux-${OS_ARCH}-debian-12" \ + "grafana-13.0.2-2-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ - curl -SsLf "https://${DOWNLOADS_URL}/${COMPONENT}.tar.gz" -O ; \ + 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 ; \ @@ -50,7 +50,7 @@ COPY rootfs / RUN /opt/bitnami/scripts/grafana/postunpack.sh ENV APP_VERSION="13.0.2" \ BITNAMI_APP_NAME="grafana" \ - IMAGE_REVISION="2" \ + IMAGE_REVISION="3" \ PATH="/opt/bitnami/mysql/bin:/opt/bitnami/common/bin:/opt/bitnami/grafana/bin:$PATH" EXPOSE 3000 diff --git a/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/grafana-13.0.2-1-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/grafana-13.0.2-1-linux-amd64-debian-12.tar.gz.sha256 deleted file mode 100644 index 6f3091b47d6f..000000000000 --- a/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/grafana-13.0.2-1-linux-amd64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -4a2cc3721ca58c9226c452fe714562601dea362bb823679b2d8abb2203a37bcb grafana-13.0.2-1-linux-amd64-debian-12.tar.gz diff --git a/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/grafana-13.0.2-1-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/grafana-13.0.2-1-linux-arm64-debian-12.tar.gz.sha256 deleted file mode 100644 index 422808119365..000000000000 --- a/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/grafana-13.0.2-1-linux-arm64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -1c0383b4f8417fe2d59f63eae51124af2aad8b6634edd8d4b67ffb7d2807a87e grafana-13.0.2-1-linux-arm64-debian-12.tar.gz diff --git a/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/grafana-13.0.2-2-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/grafana-13.0.2-2-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..4d85ea8235ad --- /dev/null +++ b/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/grafana-13.0.2-2-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +7e83d66cef734560457c6a9f377eb1bb924ed40703eda38701724b9bee191c68 grafana-13.0.2-2-linux-amd64-debian-12.tar.gz diff --git a/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/grafana-13.0.2-2-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/grafana-13.0.2-2-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..a3530edf358a --- /dev/null +++ b/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/grafana-13.0.2-2-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +329df0628d4b41cc1ba655942e5572d1ad832d0d1ffb725ea7efbbb1dd4441f3 grafana-13.0.2-2-linux-arm64-debian-12.tar.gz diff --git a/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-11-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-11-linux-amd64-debian-12.tar.gz.sha256 deleted file mode 100644 index c67cf7de5e60..000000000000 --- a/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-11-linux-amd64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -4134a42e91271bd0a48f2d6d172910afdfbcaf5251bb8c8bd49e9700aa66d99f ini-file-1.4.9-11-linux-amd64-debian-12.tar.gz diff --git a/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-11-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-11-linux-arm64-debian-12.tar.gz.sha256 deleted file mode 100644 index 51232981438f..000000000000 --- a/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-11-linux-arm64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -caafc64b69e970f938d535c3aaf7e66420e0dba2c5cbd332e55ccdfd926eed66 ini-file-1.4.9-11-linux-arm64-debian-12.tar.gz diff --git a/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-12-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-12-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..d07b04443b5d --- /dev/null +++ b/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-12-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +aba4a9b96e5a3b29743fe09c4b3279c789bace4171fe34574d166668dfc59523 ini-file-1.4.9-12-linux-amd64-debian-12.tar.gz diff --git a/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-12-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-12-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..b5397259b807 --- /dev/null +++ b/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/ini-file-1.4.9-12-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +262a2d83e7294bb3adf0664ece04686f162a6355713981c7677634f2645505f0 ini-file-1.4.9-12-linux-arm64-debian-12.tar.gz diff --git a/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/mysql-client-12.3.2-0-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/mysql-client-12.3.2-0-linux-amd64-debian-12.tar.gz.sha256 deleted file mode 100644 index 2c4b9a209395..000000000000 --- a/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/mysql-client-12.3.2-0-linux-amd64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -5b884dec9384b513fa919005e7db53fc817949bcbc3e88c61e49d12af6753a08 mysql-client-12.3.2-0-linux-amd64-debian-12.tar.gz diff --git a/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/mysql-client-12.3.2-0-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/mysql-client-12.3.2-0-linux-arm64-debian-12.tar.gz.sha256 deleted file mode 100644 index dd83bcc13e29..000000000000 --- a/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/mysql-client-12.3.2-0-linux-arm64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -c6cd215fe18568f3015248adc87362e42edc3a9d342ec31be0ddc6e1abbf7c25 mysql-client-12.3.2-0-linux-arm64-debian-12.tar.gz diff --git a/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/mysql-client-12.3.2-1-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/mysql-client-12.3.2-1-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..d17591dc0dd5 --- /dev/null +++ b/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/mysql-client-12.3.2-1-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +46ca140ab41ac9597dfec2b2625a5d8681c159b6b2ad92f543d4eb6443227d21 mysql-client-12.3.2-1-linux-amd64-debian-12.tar.gz diff --git a/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/mysql-client-12.3.2-1-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/mysql-client-12.3.2-1-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..0eb98ce3eb1a --- /dev/null +++ b/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/checksums/mysql-client-12.3.2-1-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +2ccf3157716201038f8efd1b7f183909268ede24a2f31339477011f15611c744 mysql-client-12.3.2-1-linux-arm64-debian-12.tar.gz diff --git a/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh index f0d5a5cd3389..770861ecedcd 100644 --- a/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh +++ b/bitnami/grafana/13.0/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh @@ -49,3 +49,36 @@ get_sematic_version () { fi fi } + +######################## +# Compares two semantic versions +# Arguments: +# $1 - version1: first version to compare +# $2 - version2: second version to compare +# Returns: +# -1 if version1 is less than version2 +# 0 if version1 is equal to version2 +# 1 if version1 is greater than version2 +######################### +compare_semantic_versions() { + local version1="${1:?version1 is required}" + local version2="${2:?version2 is required}" + local major1 major2 minor1 minor2 patch1 patch2 + + major1="$(get_sematic_version "$version1" 1)" + major2="$(get_sematic_version "$version2" 1)" + minor1="$(get_sematic_version "$version1" 2)" + minor2="$(get_sematic_version "$version2" 2)" + patch1="$(get_sematic_version "$version1" 3)" + patch2="$(get_sematic_version "$version2" 3)" + + if [[ "$major1" -eq "$major2" ]] && [[ "$minor1" -eq "$minor2" ]] && [[ "$patch1" -eq "$patch2" ]]; then + echo "0" + elif [[ "$major1" -lt "$major2" ]] || + { [[ "$major1" -eq "$major2" ]] && [[ "$minor1" -lt "$minor2" ]]; } || + { [[ "$major1" -eq "$major2" ]] && [[ "$minor1" -eq "$minor2" ]] && [[ "$patch1" -lt "$patch2" ]]; }; then + echo "-1" + else + echo "1" + fi +}