diff --git a/bitnami/sonarqube/26/debian-12/Dockerfile b/bitnami/sonarqube/26/debian-12/Dockerfile index a7d36e09336a..1e0aba01b827 100644 --- a/bitnami/sonarqube/26/debian-12/Dockerfile +++ b/bitnami/sonarqube/26/debian-12/Dockerfile @@ -3,12 +3,12 @@ FROM docker.io/bitnami/minideb:bookworm -ARG DOWNLOADS_URL="downloads.bitnami.com/files/stacksmith" +ARG DOWNLOADS_URL="https://downloads.bitnami.com/files/stacksmith" ARG JAVA_EXTRA_SECURITY_DIR="/bitnami/java/extra-security" ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2026-06-03T13:41:40Z" \ + org.opencontainers.image.created="2026-06-11T00:30:21Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/sonarqube/README.md" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/sonarqube" \ @@ -31,11 +31,11 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \ COMPONENTS=( \ "postgresql-client-18.4.0-0-linux-${OS_ARCH}-debian-12" \ "java-21.0.11-11-2-linux-${OS_ARCH}-debian-12" \ - "sonarqube-26.6.0-1-linux-${OS_ARCH}-debian-12" \ + "sonarqube-26.6.0-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 ; \ @@ -52,7 +52,7 @@ RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/sonarqube/postunpack.sh ENV APP_VERSION="26.6.0" \ BITNAMI_APP_NAME="sonarqube" \ - IMAGE_REVISION="1" \ + IMAGE_REVISION="2" \ JAVA_HOME="/opt/bitnami/java" \ LD_LIBRARY_PATH="/opt/bitnami/postgresql/lib" \ PATH="/opt/bitnami/postgresql/bin:/opt/bitnami/java/bin:$PATH" diff --git a/bitnami/sonarqube/26/debian-12/prebuildfs/opt/bitnami/checksums/sonarqube-26.6.0-1-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/sonarqube/26/debian-12/prebuildfs/opt/bitnami/checksums/sonarqube-26.6.0-1-linux-amd64-debian-12.tar.gz.sha256 deleted file mode 100644 index 25dcc3a4b4e7..000000000000 --- a/bitnami/sonarqube/26/debian-12/prebuildfs/opt/bitnami/checksums/sonarqube-26.6.0-1-linux-amd64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -6f1ba18afbb7424f2ab1f5e3a4a372d4be075ee01f2782f7ab08941762e85aa1 sonarqube-26.6.0-1-linux-amd64-debian-12.tar.gz diff --git a/bitnami/sonarqube/26/debian-12/prebuildfs/opt/bitnami/checksums/sonarqube-26.6.0-1-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/sonarqube/26/debian-12/prebuildfs/opt/bitnami/checksums/sonarqube-26.6.0-1-linux-arm64-debian-12.tar.gz.sha256 deleted file mode 100644 index 3a9776323281..000000000000 --- a/bitnami/sonarqube/26/debian-12/prebuildfs/opt/bitnami/checksums/sonarqube-26.6.0-1-linux-arm64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -61c59d9e0f7f430c0db881a68de3da367fbec94bdabd3394f72f1b7a1c5e691e sonarqube-26.6.0-1-linux-arm64-debian-12.tar.gz diff --git a/bitnami/sonarqube/26/debian-12/prebuildfs/opt/bitnami/checksums/sonarqube-26.6.0-2-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/sonarqube/26/debian-12/prebuildfs/opt/bitnami/checksums/sonarqube-26.6.0-2-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..97cb1efdafd2 --- /dev/null +++ b/bitnami/sonarqube/26/debian-12/prebuildfs/opt/bitnami/checksums/sonarqube-26.6.0-2-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +820705a42dd5bb1677eeb3916c7564ec03b7b393a45935c39c8b14a94032f051 sonarqube-26.6.0-2-linux-amd64-debian-12.tar.gz diff --git a/bitnami/sonarqube/26/debian-12/prebuildfs/opt/bitnami/checksums/sonarqube-26.6.0-2-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/sonarqube/26/debian-12/prebuildfs/opt/bitnami/checksums/sonarqube-26.6.0-2-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..4de3ad773575 --- /dev/null +++ b/bitnami/sonarqube/26/debian-12/prebuildfs/opt/bitnami/checksums/sonarqube-26.6.0-2-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +3f11bcd07c59144a0ed3e24efba3a9f2dd0fd43632ffa04b9b2f602b7d92e5df sonarqube-26.6.0-2-linux-arm64-debian-12.tar.gz diff --git a/bitnami/sonarqube/26/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/sonarqube/26/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh index 9d908c48579b..2d3c3bdb5f4a 100644 --- a/bitnami/sonarqube/26/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/sonarqube/26/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh @@ -170,7 +170,7 @@ ensure_user_exists() { if [[ -n "$home" ]]; then mkdir -p "$home" usermod -d "$home" "$user" >/dev/null 2>&1 - configure_permissions_ownership "$home" -d "775" -f "664" -u "$user" -g "$group" + configure_permissions_ownership "$home" -d "775" -f "664" -u "$user" -g "$group" -n fi } diff --git a/bitnami/sonarqube/26/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/sonarqube/26/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh index bbd31b26bb2c..3a996383cfab 100644 --- a/bitnami/sonarqube/26/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh +++ b/bitnami/sonarqube/26/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh @@ -20,7 +20,7 @@ ######################### is_int() { local -r int="${1:?missing value}" - if [[ "$int" =~ ^-?[0-9]+ ]]; then + if [[ "$int" =~ ^-?[0-9]+$ ]]; then true else false diff --git a/bitnami/sonarqube/26/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/sonarqube/26/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh index f0d5a5cd3389..770861ecedcd 100644 --- a/bitnami/sonarqube/26/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh +++ b/bitnami/sonarqube/26/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 +}