diff --git a/bitnami/neo4j/2026/debian-12/Dockerfile b/bitnami/neo4j/2026/debian-12/Dockerfile index 6922d5f2326f..4997054334e5 100644 --- a/bitnami/neo4j/2026/debian-12/Dockerfile +++ b/bitnami/neo4j/2026/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-05-28T17:44:27Z" \ + org.opencontainers.image.created="2026-06-09T14:46:44Z" \ org.opencontainers.image.description="Application packaged by Broadcom, Inc." \ org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/neo4j/README.md" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/neo4j" \ @@ -52,7 +52,7 @@ RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/neo4j/postunpack.sh ENV APP_VERSION="2026.5.0" \ BITNAMI_APP_NAME="neo4j" \ - IMAGE_REVISION="0" \ + IMAGE_REVISION="1" \ JAVA_HOME="/opt/bitnami/java" \ JAVA_OPTS="-Duser.home=/opt/bitnami/neo4j/.home" \ PATH="/opt/bitnami/java/bin:/opt/bitnami/neo4j/bin:$PATH" diff --git a/bitnami/neo4j/2026/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/neo4j/2026/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh index 9d908c48579b..2d3c3bdb5f4a 100644 --- a/bitnami/neo4j/2026/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/neo4j/2026/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/neo4j/2026/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/neo4j/2026/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh index bbd31b26bb2c..3a996383cfab 100644 --- a/bitnami/neo4j/2026/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh +++ b/bitnami/neo4j/2026/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/neo4j/2026/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh b/bitnami/neo4j/2026/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh index f0d5a5cd3389..770861ecedcd 100644 --- a/bitnami/neo4j/2026/debian-12/prebuildfs/opt/bitnami/scripts/libversion.sh +++ b/bitnami/neo4j/2026/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/neo4j/2026/debian-12/rootfs/opt/bitnami/scripts/libneo4j.sh b/bitnami/neo4j/2026/debian-12/rootfs/opt/bitnami/scripts/libneo4j.sh index 76d300e37566..92b22bfb7a14 100644 --- a/bitnami/neo4j/2026/debian-12/rootfs/opt/bitnami/scripts/libneo4j.sh +++ b/bitnami/neo4j/2026/debian-12/rootfs/opt/bitnami/scripts/libneo4j.sh @@ -225,7 +225,7 @@ neo4j_initialize() { if ! [[ -f "${NEO4J_MOUNTED_CONF_DIR}/apoc.conf" ]]; then ## Apoc plugin configuration - ## Source: https://neo4j.com/labs/apoc/4.2/config/ + ## Source: https://neo4j.com/labs/apoc/2026/config neo4j_conf_set "apoc.import.file.enabled" "$NEO4J_APOC_IMPORT_FILE_ENABLED" "$NEO4J_APOC_CONF_FILE" neo4j_conf_set "apoc.import.file.use_neo4j_config" "$NEO4J_APOC_IMPORT_FILE_USE_NEO4J_CONFIG" "$NEO4J_APOC_CONF_FILE" else @@ -258,7 +258,7 @@ neo4j_initialize() { # None ######################### neo4j_custom_init_scripts() { - if [[ -n $(find "${NEO4J_INITSCRIPTS_DIR}/" -type f -regex ".*\.sh") ]] && [[ ! -f "${NEO4J_INITSCRIPTS_DIR}/.user_scripts_initialized" ]]; then + if [[ -n $(find "${NEO4J_INITSCRIPTS_DIR}/" -type f -regex ".*\.sh") ]] && [[ ! -f "${NEO4J_VOLUME_DIR}/.user_scripts_initialized" ]]; then info "Loading user's custom files from ${NEO4J_INITSCRIPTS_DIR} ..." local -r tmp_file="/tmp/filelist" find "${NEO4J_INITSCRIPTS_DIR}/" -type f -regex ".*\.sh" | sort >"$tmp_file" @@ -277,7 +277,7 @@ neo4j_custom_init_scripts() { esac done <$tmp_file rm -f "$tmp_file" - touch "$NEO4J_VOLUME_DIR"/.user_scripts_initialized + touch "${NEO4J_VOLUME_DIR}/.user_scripts_initialized" fi } diff --git a/bitnami/neo4j/2026/debian-12/rootfs/opt/bitnami/scripts/neo4j-env.sh b/bitnami/neo4j/2026/debian-12/rootfs/opt/bitnami/scripts/neo4j-env.sh index a7167177e161..72a7b4b761e4 100644 --- a/bitnami/neo4j/2026/debian-12/rootfs/opt/bitnami/scripts/neo4j-env.sh +++ b/bitnami/neo4j/2026/debian-12/rootfs/opt/bitnami/scripts/neo4j-env.sh @@ -89,7 +89,7 @@ export NEO4J_BIND_ADDRESS="${NEO4J_BIND_ADDRESS:-0.0.0.0}" export NEO4J_ALLOW_UPGRADE="${NEO4J_ALLOW_UPGRADE:-true}" export NEO4J_PASSWORD="${NEO4J_PASSWORD:-bitnami1}" export NEO4J_APOC_IMPORT_FILE_ENABLED="${NEO4J_APOC_IMPORT_FILE_ENABLED:-true}" -export NEO4J_APOC_IMPORT_FILE_USE_NEO4J_CONFIG="${NEO4J_APOC_IMPORT_FILE_USE_NEO4J_CONFIG:-false}" +export NEO4J_APOC_IMPORT_FILE_USE_NEO4J_CONFIG="${NEO4J_APOC_IMPORT_FILE_USE_NEO4J_CONFIG:-true}" export NEO4J_BOLT_PORT_NUMBER="${NEO4J_BOLT_PORT_NUMBER:-7687}" export NEO4J_HTTP_PORT_NUMBER="${NEO4J_HTTP_PORT_NUMBER:-7474}" export NEO4J_HTTPS_PORT_NUMBER="${NEO4J_HTTPS_PORT_NUMBER:-7473}" diff --git a/bitnami/neo4j/README.md b/bitnami/neo4j/README.md index d9c2fba0658a..87a44f8a98ec 100644 --- a/bitnami/neo4j/README.md +++ b/bitnami/neo4j/README.md @@ -79,7 +79,7 @@ The following tables list the main variables you can set. | `NEO4J_ALLOW_UPGRADE` | Allow automatic schema upgrades | `true` | | `NEO4J_PASSWORD` | Neo4j password. | `bitnami1` | | `NEO4J_APOC_IMPORT_FILE_ENABLED` | Allow importing files using the apoc library | `true` | -| `NEO4J_APOC_IMPORT_FILE_USE_NEO4J_CONFIG` | Use neo4j configuration with the apoc library | `false` | +| `NEO4J_APOC_IMPORT_FILE_USE_NEO4J_CONFIG` | Use neo4j configuration with the apoc library | `true` | | `NEO4J_BOLT_PORT_NUMBER` | Port used for the bolt protocol. | `7687` | | `NEO4J_HTTP_PORT_NUMBER` | Port used for the http protocol. | `7474` | | `NEO4J_HTTPS_PORT_NUMBER` | Port used for the https protocol. | `7473` |