diff --git a/bitnami/wildfly/40/debian-12/Dockerfile b/bitnami/wildfly/40/debian-12/Dockerfile index 5b531ac765cf8..e667f532389ae 100644 --- a/bitnami/wildfly/40/debian-12/Dockerfile +++ b/bitnami/wildfly/40/debian-12/Dockerfile @@ -8,7 +8,7 @@ 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-02T11:10:45Z" \ + org.opencontainers.image.created="2026-06-05T21:47:36Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/wildfly/README.md" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/wildfly" \ @@ -30,7 +30,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=( \ "jre-21.0.11-11-1-linux-${OS_ARCH}-debian-12" \ - "wildfly-40.0.0-0-linux-${OS_ARCH}-debian-12" \ + "wildfly-40.0.0-1-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -52,7 +52,7 @@ RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/wildfly/postunpack.sh ENV APP_VERSION="40.0.0" \ BITNAMI_APP_NAME="wildfly" \ - IMAGE_REVISION="1" \ + IMAGE_REVISION="2" \ JAVA_HOME="/opt/bitnami/java" \ PATH="/opt/bitnami/java/bin:/opt/bitnami/wildfly/bin:$PATH" \ WILDFLY_HOME="/home/wildfly" diff --git a/bitnami/wildfly/40/debian-12/prebuildfs/opt/bitnami/checksums/wildfly-40.0.0-0-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/wildfly/40/debian-12/prebuildfs/opt/bitnami/checksums/wildfly-40.0.0-0-linux-amd64-debian-12.tar.gz.sha256 deleted file mode 100644 index 35b6c20adc2f8..0000000000000 --- a/bitnami/wildfly/40/debian-12/prebuildfs/opt/bitnami/checksums/wildfly-40.0.0-0-linux-amd64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -f04fdcaf51cbfc196c0834ec20445afa16675609e0063a88d415214bd9850c42 wildfly-40.0.0-0-linux-amd64-debian-12.tar.gz diff --git a/bitnami/wildfly/40/debian-12/prebuildfs/opt/bitnami/checksums/wildfly-40.0.0-0-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/wildfly/40/debian-12/prebuildfs/opt/bitnami/checksums/wildfly-40.0.0-0-linux-arm64-debian-12.tar.gz.sha256 deleted file mode 100644 index 83b457d229eeb..0000000000000 --- a/bitnami/wildfly/40/debian-12/prebuildfs/opt/bitnami/checksums/wildfly-40.0.0-0-linux-arm64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -997548424c266f8f1108db9a360d2b10dd9225422e90f3963dce0d866f39642c wildfly-40.0.0-0-linux-arm64-debian-12.tar.gz diff --git a/bitnami/wildfly/40/debian-12/prebuildfs/opt/bitnami/checksums/wildfly-40.0.0-1-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/wildfly/40/debian-12/prebuildfs/opt/bitnami/checksums/wildfly-40.0.0-1-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 0000000000000..7a4293a1f4f22 --- /dev/null +++ b/bitnami/wildfly/40/debian-12/prebuildfs/opt/bitnami/checksums/wildfly-40.0.0-1-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +11402f7ff908a2825a31c58aee776def81d6d0c22a63b88ec18cb947f0e868b5 wildfly-40.0.0-1-linux-amd64-debian-12.tar.gz diff --git a/bitnami/wildfly/40/debian-12/prebuildfs/opt/bitnami/checksums/wildfly-40.0.0-1-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/wildfly/40/debian-12/prebuildfs/opt/bitnami/checksums/wildfly-40.0.0-1-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 0000000000000..fddcca72efa55 --- /dev/null +++ b/bitnami/wildfly/40/debian-12/prebuildfs/opt/bitnami/checksums/wildfly-40.0.0-1-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +4849b35cfd1ce398e2f5aa0c2b766c058e33897165c8e3536a6328467040db43 wildfly-40.0.0-1-linux-arm64-debian-12.tar.gz diff --git a/bitnami/wildfly/40/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/wildfly/40/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh index 9d908c48579b9..2d3c3bdb5f4ae 100644 --- a/bitnami/wildfly/40/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/wildfly/40/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/wildfly/40/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/wildfly/40/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh index bbd31b26bb2c5..3a996383cfabd 100644 --- a/bitnami/wildfly/40/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh +++ b/bitnami/wildfly/40/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/wildfly/40/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/wildfly/40/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh index f0d5a5cd33892..770861ecedcd3 100644 --- a/bitnami/wildfly/40/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh +++ b/bitnami/wildfly/40/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 +}