diff --git a/bitnami/appsmith/2/debian-12/Dockerfile b/bitnami/appsmith/2/debian-12/Dockerfile index 759a58e0d813..c2596745899a 100644 --- a/bitnami/appsmith/2/debian-12/Dockerfile +++ b/bitnami/appsmith/2/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-03T10:57:36Z" \ + org.opencontainers.image.created="2026-06-10T21:07:36Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/appsmith/README.md" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/appsmith" \ @@ -28,17 +28,17 @@ 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=( \ - "render-template-1.0.9-166-linux-${OS_ARCH}-debian-12" \ - "python-3.14.5-2-linux-${OS_ARCH}-debian-12" \ + "render-template-1.0.9-167-linux-${OS_ARCH}-debian-12" \ + "python-3.14.6-0-linux-${OS_ARCH}-debian-12" \ "node-24.16.0-0-linux-${OS_ARCH}-debian-12" \ - "nginx-1.31.1-0-linux-${OS_ARCH}-debian-12" \ + "nginx-1.31.1-1-linux-${OS_ARCH}-debian-12" \ "mongodb-shell-2.8.3-0-linux-${OS_ARCH}-debian-12" \ "jre-25.0.3-11-1-linux-${OS_ARCH}-debian-12" \ - "appsmith-2.1.0-0-linux-${OS_ARCH}-debian-12" \ + "appsmith-2.1.0-1-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 ; \ @@ -55,7 +55,7 @@ RUN /opt/bitnami/scripts/nginx/postunpack.sh RUN /opt/bitnami/scripts/appsmith/postunpack.sh ENV APP_VERSION="2.1.0" \ BITNAMI_APP_NAME="appsmith" \ - IMAGE_REVISION="0" \ + IMAGE_REVISION="1" \ NGINX_HTTPS_PORT_NUMBER="" \ NGINX_HTTP_PORT_NUMBER="" \ PATH="/opt/bitnami/common/bin:/opt/bitnami/python/bin:/opt/bitnami/node/bin:/opt/bitnami/nginx/sbin:/opt/bitnami/mongodb/bin:/opt/bitnami/java/bin:$PATH" diff --git a/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/appsmith-2.1.0-0-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/appsmith-2.1.0-0-linux-amd64-debian-12.tar.gz.sha256 deleted file mode 100644 index c791ca5c127f..000000000000 --- a/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/appsmith-2.1.0-0-linux-amd64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -07370ba1908b2b40fdd4d8cfd4815dd509b845af55c4f05c0f28ab2b777d0253 appsmith-2.1.0-0-linux-amd64-debian-12.tar.gz diff --git a/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/appsmith-2.1.0-0-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/appsmith-2.1.0-0-linux-arm64-debian-12.tar.gz.sha256 deleted file mode 100644 index f3d623a482cc..000000000000 --- a/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/appsmith-2.1.0-0-linux-arm64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -253dee83a55faec1213a4a38771361d2d23eff75b9410795ab8cf25e3945564b appsmith-2.1.0-0-linux-arm64-debian-12.tar.gz diff --git a/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/appsmith-2.1.0-1-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/appsmith-2.1.0-1-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..d58ad06ee6ec --- /dev/null +++ b/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/appsmith-2.1.0-1-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +92b5f2508df3d5196b8317bb15076bbc3c2f1414559489f2ab4d38fec01245f4 appsmith-2.1.0-1-linux-amd64-debian-12.tar.gz diff --git a/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/appsmith-2.1.0-1-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/appsmith-2.1.0-1-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..171887caaae5 --- /dev/null +++ b/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/appsmith-2.1.0-1-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +55cdabeb1b9bb6d46eecb55fe4ac7e2f0cc78bc13528caa1eb67088ffb1dd6a1 appsmith-2.1.0-1-linux-arm64-debian-12.tar.gz diff --git a/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/nginx-1.31.1-0-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/nginx-1.31.1-0-linux-amd64-debian-12.tar.gz.sha256 deleted file mode 100644 index 5942f97ff88f..000000000000 --- a/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/nginx-1.31.1-0-linux-amd64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -8cf73a152d7bd8d905e1d95c20f606b6906927e08a20c851ecc86beba7999e43 nginx-1.31.1-0-linux-amd64-debian-12.tar.gz diff --git a/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/nginx-1.31.1-0-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/nginx-1.31.1-0-linux-arm64-debian-12.tar.gz.sha256 deleted file mode 100644 index cde862a02c7d..000000000000 --- a/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/nginx-1.31.1-0-linux-arm64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -e3cbff22912e1de7ac81c3604900e5c1c83cc0be025211bb2a00f382923f4d12 nginx-1.31.1-0-linux-arm64-debian-12.tar.gz diff --git a/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/nginx-1.31.1-1-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/nginx-1.31.1-1-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..578584691823 --- /dev/null +++ b/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/nginx-1.31.1-1-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +5bb44dde300969ec4c2b84453e64a6f14a095e2e651841bff27c049bd74e3b95 nginx-1.31.1-1-linux-amd64-debian-12.tar.gz diff --git a/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/nginx-1.31.1-1-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/nginx-1.31.1-1-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..97c96cb61009 --- /dev/null +++ b/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/nginx-1.31.1-1-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +c6dd41ec7b6c712d298b315382963ac5a560b8c2ba5ea5c18fc8925ac70f2a35 nginx-1.31.1-1-linux-arm64-debian-12.tar.gz diff --git a/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/python-3.14.5-2-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/python-3.14.5-2-linux-amd64-debian-12.tar.gz.sha256 deleted file mode 100644 index 5a6ff85bb43e..000000000000 --- a/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/python-3.14.5-2-linux-amd64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -873f755a79e805bb950da235f991af2edbe89c23dad4b13cd33b089e4f1b7ff6 python-3.14.5-2-linux-amd64-debian-12.tar.gz diff --git a/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/python-3.14.5-2-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/python-3.14.5-2-linux-arm64-debian-12.tar.gz.sha256 deleted file mode 100644 index 6c3f3de285fd..000000000000 --- a/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/python-3.14.5-2-linux-arm64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -be023b204af7213748a2bae639e1eec89ce42238b376d68d6262ad364f49c1d3 python-3.14.5-2-linux-arm64-debian-12.tar.gz diff --git a/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/python-3.14.6-0-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/python-3.14.6-0-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..79f77f604787 --- /dev/null +++ b/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/python-3.14.6-0-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +1a97bb83a7ce1648bde3baf4195826f674fadf488c877c1164a7b2a269a08f80 python-3.14.6-0-linux-amd64-debian-12.tar.gz diff --git a/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/python-3.14.6-0-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/python-3.14.6-0-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..f26dbaecdb8b --- /dev/null +++ b/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/python-3.14.6-0-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +a3da86d328f00168c968287172d2434e56f65b766804199e3e6082a51361dc2f python-3.14.6-0-linux-arm64-debian-12.tar.gz diff --git a/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-166-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-166-linux-amd64-debian-12.tar.gz.sha256 deleted file mode 100644 index 09a2ab4133ea..000000000000 --- a/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-166-linux-amd64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -e2467be27e79a387c78b8ef3a57ceaa07bea65009972571f20dcf58631656e0b render-template-1.0.9-166-linux-amd64-debian-12.tar.gz diff --git a/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-166-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-166-linux-arm64-debian-12.tar.gz.sha256 deleted file mode 100644 index 25ae43b180a6..000000000000 --- a/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-166-linux-arm64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -c2c7634c5c0882d2dbd822744f6b5bdb074a07a1abf710c67e1206f1c20b8afa render-template-1.0.9-166-linux-arm64-debian-12.tar.gz diff --git a/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-167-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-167-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..5678e3bf679f --- /dev/null +++ b/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-167-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +f311b56146985169ff7d24083cbb4786b68f3f668707ec04901b54b91bec4d98 render-template-1.0.9-167-linux-amd64-debian-12.tar.gz diff --git a/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-167-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-167-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..8b1c3ffbce03 --- /dev/null +++ b/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/checksums/render-template-1.0.9-167-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +0904d2f41140fa1f027ab31e6303d5f648a71b9ab241510a69188f7970d59c02 render-template-1.0.9-167-linux-arm64-debian-12.tar.gz diff --git a/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh index 9d908c48579b..2d3c3bdb5f4a 100644 --- a/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/appsmith/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/appsmith/2/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh index bbd31b26bb2c..3a996383cfab 100644 --- a/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh +++ b/bitnami/appsmith/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/appsmith/2/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh index f0d5a5cd3389..770861ecedcd 100644 --- a/bitnami/appsmith/2/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh +++ b/bitnami/appsmith/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 +} diff --git a/bitnami/appsmith/2/debian-12/rootfs/opt/bitnami/scripts/libnginx.sh b/bitnami/appsmith/2/debian-12/rootfs/opt/bitnami/scripts/libnginx.sh index 80dceff58cfd..f3f033515cc0 100644 --- a/bitnami/appsmith/2/debian-12/rootfs/opt/bitnami/scripts/libnginx.sh +++ b/bitnami/appsmith/2/debian-12/rootfs/opt/bitnami/scripts/libnginx.sh @@ -588,14 +588,15 @@ nginx_update_app_configuration() { rename_conf_file() { local -r origin="$1" local -r destination="$2" - if is_file_writable "$origin" && is_file_writable "$destination"; then - warn "Could not rename server block file '${origin}' to '${destination}' due to lack of permissions." - else - mv "$origin" "$destination" + if ! is_file_writable "$origin" || ! is_file_writable "$destination"; then + warn "Could not rename server block file '${origin}' to '${destination}': lack of permissions." + return 1 fi + mv "$origin" "$destination" } - is_boolean_yes "$disable_http" && [[ -e "$http_server_block" ]] && rename_conf_file "${http_server_block}${disable_suffix}" "$http_server_block" - is_boolean_yes "$disable_https" && [[ -e "$https_server_block" ]] && rename_conf_file "${https_server_block}${disable_suffix}" "$https_server_block" + local -r disable_suffix=".disabled" + is_boolean_yes "$disable_http" && [[ -e "$http_server_block" ]] && rename_conf_file "${http_server_block}" "${http_server_block}${disable_suffix}" + is_boolean_yes "$disable_https" && [[ -e "$https_server_block" ]] && rename_conf_file "$https_server_block" "${https_server_block}${disable_suffix}" is_boolean_yes "$enable_http" && [[ -e "${http_server_block}${disable_suffix}" ]] && rename_conf_file "${http_server_block}${disable_suffix}" "$http_server_block" is_boolean_yes "$enable_https" && [[ -e "${https_server_block}${disable_suffix}" ]] && rename_conf_file "${https_server_block}${disable_suffix}" "$https_server_block" # Update only configuration files without the '.disabled' suffix