diff --git a/bitnami/janusgraph/1/debian-12/Dockerfile b/bitnami/janusgraph/1/debian-12/Dockerfile index 9807807b5da2..f952d0b549df 100644 --- a/bitnami/janusgraph/1/debian-12/Dockerfile +++ b/bitnami/janusgraph/1/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-11T02:09:08Z" \ + org.opencontainers.image.created="2026-07-11T03:00:38Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/janusgraph/README.md" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/janusgraph" \ @@ -31,7 +31,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=( \ "nss-wrapper-1.1.16-0-linux-${OS_ARCH}-debian-12" \ - "yq-4.53.3-1-linux-${OS_ARCH}-debian-12" \ + "yq-4.53.3-2-linux-${OS_ARCH}-debian-12" \ "jre-11.0.31-11-1-linux-${OS_ARCH}-debian-12" \ "janusgraph-1.1.0-3-linux-${OS_ARCH}-debian-12" \ ) ; \ @@ -55,7 +55,7 @@ RUN /opt/bitnami/scripts/janusgraph/postunpack.sh RUN /opt/bitnami/scripts/java/postunpack.sh ENV APP_VERSION="1.1.0" \ BITNAMI_APP_NAME="janusgraph" \ - IMAGE_REVISION="40" \ + IMAGE_REVISION="41" \ JAVA_HOME="/opt/bitnami/java" USER 1001 diff --git a/bitnami/janusgraph/1/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.3-1-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/janusgraph/1/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.3-1-linux-amd64-debian-12.tar.gz.sha256 deleted file mode 100644 index 075a7512681f..000000000000 --- a/bitnami/janusgraph/1/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.3-1-linux-amd64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -adcab17624d76cc523c54bc603664d08341c8817175615ce8bb226d4e527cdec yq-4.53.3-1-linux-amd64-debian-12.tar.gz diff --git a/bitnami/janusgraph/1/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.3-1-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/janusgraph/1/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.3-1-linux-arm64-debian-12.tar.gz.sha256 deleted file mode 100644 index 90ec18816415..000000000000 --- a/bitnami/janusgraph/1/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.3-1-linux-arm64-debian-12.tar.gz.sha256 +++ /dev/null @@ -1 +0,0 @@ -2613880712b56432dbcecb92a563967a7546b4cc4cac2766b5fa419a231d4f66 yq-4.53.3-1-linux-arm64-debian-12.tar.gz diff --git a/bitnami/janusgraph/1/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.3-2-linux-amd64-debian-12.tar.gz.sha256 b/bitnami/janusgraph/1/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.3-2-linux-amd64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..159efe9517cd --- /dev/null +++ b/bitnami/janusgraph/1/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.3-2-linux-amd64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +d7cb02bda9fa20f362656577296b535e338710f43057803014a124d344b0be04 yq-4.53.3-2-linux-amd64-debian-12.tar.gz diff --git a/bitnami/janusgraph/1/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.3-2-linux-arm64-debian-12.tar.gz.sha256 b/bitnami/janusgraph/1/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.3-2-linux-arm64-debian-12.tar.gz.sha256 new file mode 100644 index 000000000000..d360f0478642 --- /dev/null +++ b/bitnami/janusgraph/1/debian-12/prebuildfs/opt/bitnami/checksums/yq-4.53.3-2-linux-arm64-debian-12.tar.gz.sha256 @@ -0,0 +1 @@ +bbe968c785b1dad4c8ce87248b6770bb779bb7e72b3338a3a123a9c2602712f8 yq-4.53.3-2-linux-arm64-debian-12.tar.gz diff --git a/bitnami/janusgraph/1/debian-12/prebuildfs/opt/bitnami/scripts/libpersistence.sh b/bitnami/janusgraph/1/debian-12/prebuildfs/opt/bitnami/scripts/libpersistence.sh index 18445e7d27fa..833ee5ab1d65 100644 --- a/bitnami/janusgraph/1/debian-12/prebuildfs/opt/bitnami/scripts/libpersistence.sh +++ b/bitnami/janusgraph/1/debian-12/prebuildfs/opt/bitnami/scripts/libpersistence.sh @@ -39,7 +39,7 @@ persist_app() { fi pushd "$install_dir" >/dev/null || exit local file_to_persist_relative file_to_persist_destination file_to_persist_destination_folder - local -r tmp_file="/tmp/perms.acl" + local -r acl_file="$(mktemp "${TMPDIR:-/tmp}"/acl.XXXXXXXXXX)" for file_to_persist in "${files_to_persist[@]}"; do if [[ ! -f "$file_to_persist" && ! -d "$file_to_persist" ]]; then error "Cannot persist '${file_to_persist}' because it does not exist" @@ -50,22 +50,22 @@ persist_app() { file_to_persist_destination_folder="$(dirname "$file_to_persist_destination")" # Get original permissions for existing files, which will be applied later # Exclude the root directory with 'sed', to avoid issues when copying the entirety of it to a volume - getfacl -R "$file_to_persist_relative" | sed -E '/# file: (\..+|[^.])/,$!d' > "$tmp_file" + getfacl -R "$file_to_persist_relative" | sed -E '/# file: (\..+|[^.])/,$!d' > "$acl_file" # Copy directories to the volume ensure_dir_exists "$file_to_persist_destination_folder" cp -Lr --preserve=links "$file_to_persist_relative" "$file_to_persist_destination_folder" # Restore permissions pushd "$persist_dir" >/dev/null || exit if am_i_root; then - setfacl --restore="$tmp_file" + setfacl --restore="$acl_file" else # When running as non-root, don't change ownership - setfacl --restore=<(grep -E -v '^# (owner|group):' "$tmp_file") + setfacl --restore=<(grep -E -v '^# (owner|group):' "$acl_file") fi popd >/dev/null || exit done popd >/dev/null || exit - rm -f "$tmp_file" + rm -f "$acl_file" # Install the persisted files into the installation directory, via symlinks restore_persisted_app "$@" } diff --git a/bitnami/janusgraph/1/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/janusgraph/1/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh index a8293800d55c..c1d60a5c5f42 100644 --- a/bitnami/janusgraph/1/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/janusgraph/1/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh @@ -424,3 +424,23 @@ EOF WantedBy=bitnami.service EOF } + +######################## +# Register a SIGTERM handler that forwards the signal to all child processes. +# Should be called at the start of run.sh, before launching any background processes. +# Globals: +# None +# Arguments: +# None +# Returns: +# None +######################### +service_register_term_forwarder() { + _service_forward_term() { + warn "Caught signal SIGTERM, passing it to child processes..." + pgrep -P $$ | xargs kill -TERM 2>/dev/null + wait + exit $? + } + trap _service_forward_term TERM +}