diff --git a/bitnami/harbor-jobservice/2/debian-12/Dockerfile b/bitnami/harbor-jobservice/2/debian-12/Dockerfile index 4febb0db2d40..bc9ef5d7b644 100644 --- a/bitnami/harbor-jobservice/2/debian-12/Dockerfile +++ b/bitnami/harbor-jobservice/2/debian-12/Dockerfile @@ -7,7 +7,7 @@ ARG DOWNLOADS_URL="downloads.bitnami.com/files/stacksmith" ARG TARGETARCH LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2026-06-03T00:09:28Z" \ + org.opencontainers.image.created="2026-06-05T22:33:17Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/harbor-jobservice/README.md" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/harbor-jobservice" \ @@ -29,7 +29,7 @@ RUN --mount=type=secret,id=downloads_url,env=SECRET_DOWNLOADS_URL \ mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \ COMPONENTS=( \ "yq-4.53.2-2-linux-${OS_ARCH}-debian-12" \ - "harbor-jobservice-2.15.1-2-linux-${OS_ARCH}-debian-12" \ + "harbor-jobservice-2.15.1-3-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -49,7 +49,7 @@ COPY rootfs / RUN /opt/bitnami/scripts/harbor-jobservice/postunpack.sh ENV APP_VERSION="2.15.1" \ BITNAMI_APP_NAME="harbor-jobservice" \ - IMAGE_REVISION="6" \ + IMAGE_REVISION="7" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/harbor-jobservice/bin:$PATH" VOLUME [ "/etc/jobservice", "/var/log/jobs" ] diff --git a/bitnami/harbor-jobservice/2/debian-12/prebuildfs/opt/bitnami/checksums/harbor-jobservice-2.15.1-2-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/harbor-jobservice/2/debian-12/prebuildfs/opt/bitnami/checksums/harbor-jobservice-2.15.1-2-linux-amd64-debian-12.tar.gz.sha256 deleted file mode 100644 index 73af464676a5..000000000000 --- a/bitnami/harbor-jobservice/2/debian-12/prebuildfs/opt/bitnami/checksums/harbor-jobservice-2.15.1-2-linux-amd64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -fee4290d7f481d0ba4b41285f7b0bb2cc5b9bb03675dc60cf5299b435e3a8008 harbor-jobservice-2.15.1-2-linux-amd64-debian-12.tar.gz diff --git a/bitnami/harbor-jobservice/2/debian-12/prebuildfs/opt/bitnami/checksums/harbor-jobservice-2.15.1-2-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/harbor-jobservice/2/debian-12/prebuildfs/opt/bitnami/checksums/harbor-jobservice-2.15.1-2-linux-arm64-debian-12.tar.gz.sha256 deleted file mode 100644 index 97e7cb209066..000000000000 --- a/bitnami/harbor-jobservice/2/debian-12/prebuildfs/opt/bitnami/checksums/harbor-jobservice-2.15.1-2-linux-arm64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -787e8fe1956c9c4cadcbe00031a52b998c9b3d9d1ebc9a46d51d9b32cd332783 harbor-jobservice-2.15.1-2-linux-arm64-debian-12.tar.gz diff --git a/bitnami/harbor-jobservice/2/debian-12/prebuildfs/opt/bitnami/checksums/harbor-jobservice-2.15.1-3-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/harbor-jobservice/2/debian-12/prebuildfs/opt/bitnami/checksums/harbor-jobservice-2.15.1-3-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..5f2f329b6527 --- /dev/null +++ b/bitnami/harbor-jobservice/2/debian-12/prebuildfs/opt/bitnami/checksums/harbor-jobservice-2.15.1-3-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +003e7cdec7f3fbe1dc5be2963950ff4f0786d45b2f08e11ab3d27d191cdfd2e4 harbor-jobservice-2.15.1-3-linux-amd64-debian-12.tar.gz diff --git a/bitnami/harbor-jobservice/2/debian-12/prebuildfs/opt/bitnami/checksums/harbor-jobservice-2.15.1-3-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/harbor-jobservice/2/debian-12/prebuildfs/opt/bitnami/checksums/harbor-jobservice-2.15.1-3-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..2e0d0a4e142c --- /dev/null +++ b/bitnami/harbor-jobservice/2/debian-12/prebuildfs/opt/bitnami/checksums/harbor-jobservice-2.15.1-3-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +193ea0a9e917746c09f5805775022517a37fcc69964ef62a1d0202c3803f1843 harbor-jobservice-2.15.1-3-linux-arm64-debian-12.tar.gz diff --git a/bitnami/harbor-jobservice/2/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/harbor-jobservice/2/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh index 9d908c48579b..2d3c3bdb5f4a 100644 --- a/bitnami/harbor-jobservice/2/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/harbor-jobservice/2/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/harbor-jobservice/2/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/harbor-jobservice/2/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh index bbd31b26bb2c..3a996383cfab 100644 --- a/bitnami/harbor-jobservice/2/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh +++ b/bitnami/harbor-jobservice/2/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/harbor-jobservice/2/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/harbor-jobservice/2/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh index f0d5a5cd3389..770861ecedcd 100644 --- a/bitnami/harbor-jobservice/2/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh +++ b/bitnami/harbor-jobservice/2/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 +}