diff --git a/bitnami/neo4j/5/debian-12/Dockerfile b/bitnami/neo4j/5/debian-12/Dockerfile index 2ce92170d1bd..1f1a885f5739 100644 --- a/bitnami/neo4j/5/debian-12/Dockerfile +++ b/bitnami/neo4j/5/debian-12/Dockerfile @@ -1,4 +1,4 @@ -# Copyright VMware, Inc. +# Copyright Broadcom, Inc. All Rights Reserved. # SPDX-License-Identifier: APACHE-2.0 FROM docker.io/bitnami/minideb:bookworm @@ -8,15 +8,15 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2024-05-04T15:09:27Z" \ - org.opencontainers.image.description="Application packaged by VMware, Inc" \ + org.opencontainers.image.created="2024-05-31T14:15:38Z" \ + 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.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="5.18.1-debian-12-r4" \ + org.opencontainers.image.ref.name="5.20.0-debian-12-r0" \ org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/neo4j" \ org.opencontainers.image.title="neo4j" \ - org.opencontainers.image.vendor="VMware, Inc." \ - org.opencontainers.image.version="5.18.1" + org.opencontainers.image.vendor="Broadcom, Inc." \ + org.opencontainers.image.version="5.20.0" ENV HOME="/opt/bitnami/neo4j/.home" \ OS_ARCH="${TARGETARCH:-amd64}" \ @@ -29,8 +29,8 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"] RUN install_packages ca-certificates curl jq procps zlib1g RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \ COMPONENTS=( \ - "java-17.0.11-10-0-linux-${OS_ARCH}-debian-12" \ - "neo4j-5.18.1-0-linux-${OS_ARCH}-debian-12" \ + "java-17.0.11-12-0-linux-${OS_ARCH}-debian-12" \ + "neo4j-5.20.0-0-linux-${OS_ARCH}-debian-12" \ ) ; \ for COMPONENT in "${COMPONENTS[@]}"; do \ if [ ! -f "${COMPONENT}.tar.gz" ]; then \ @@ -50,7 +50,7 @@ RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true COPY rootfs / RUN /opt/bitnami/scripts/java/postunpack.sh RUN /opt/bitnami/scripts/neo4j/postunpack.sh -ENV APP_VERSION="5.18.1" \ +ENV APP_VERSION="5.20.0" \ BITNAMI_APP_NAME="neo4j" \ JAVA_HOME="/opt/bitnami/java" \ JAVA_OPTS="-Duser.home=/opt/bitnami/neo4j/.home" \ diff --git a/bitnami/neo4j/5/debian-12/docker-compose.yml b/bitnami/neo4j/5/debian-12/docker-compose.yml index 3f085285cb66..4314e1b4a86a 100644 --- a/bitnami/neo4j/5/debian-12/docker-compose.yml +++ b/bitnami/neo4j/5/debian-12/docker-compose.yml @@ -1,4 +1,4 @@ -# Copyright VMware, Inc. +# Copyright Broadcom, Inc. All Rights Reserved. # SPDX-License-Identifier: APACHE-2.0 version: '2' diff --git a/bitnami/neo4j/5/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/neo4j/5/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json index fb72843c8c16..a404270729d1 100644 --- a/bitnami/neo4j/5/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json +++ b/bitnami/neo4j/5/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json @@ -3,12 +3,12 @@ "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "17.0.11-10-0" + "version": "17.0.11-12-0" }, "neo4j": { "arch": "amd64", "distro": "debian-12", "type": "NAMI", - "version": "5.18.1-0" + "version": "5.20.0-0" } } \ No newline at end of file diff --git a/bitnami/neo4j/5/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/neo4j/5/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh index aa782fc6a4db..d239f9853573 100644 --- a/bitnami/neo4j/5/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh +++ b/bitnami/neo4j/5/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright VMware, Inc. +# Copyright Broadcom, Inc. All Rights Reserved. # SPDX-License-Identifier: APACHE-2.0 # # Bitnami custom library diff --git a/bitnami/neo4j/5/debian-12/prebuildfs/opt/bitnami/scripts/libfile.sh b/bitnami/neo4j/5/debian-12/prebuildfs/opt/bitnami/scripts/libfile.sh index 63759c777f3b..1c69e0e48a5d 100644 --- a/bitnami/neo4j/5/debian-12/prebuildfs/opt/bitnami/scripts/libfile.sh +++ b/bitnami/neo4j/5/debian-12/prebuildfs/opt/bitnami/scripts/libfile.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright VMware, Inc. +# Copyright Broadcom, Inc. All Rights Reserved. # SPDX-License-Identifier: APACHE-2.0 # # Library for managing files diff --git a/bitnami/neo4j/5/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/neo4j/5/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh index 96b22f99710c..970d62417964 100644 --- a/bitnami/neo4j/5/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh +++ b/bitnami/neo4j/5/debian-12/prebuildfs/opt/bitnami/scripts/libfs.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright VMware, Inc. +# Copyright Broadcom, Inc. All Rights Reserved. # SPDX-License-Identifier: APACHE-2.0 # # Library for file system actions diff --git a/bitnami/neo4j/5/debian-12/prebuildfs/opt/bitnami/scripts/libhook.sh b/bitnami/neo4j/5/debian-12/prebuildfs/opt/bitnami/scripts/libhook.sh index dadd06149e00..f3a5fe7868ee 100644 --- a/bitnami/neo4j/5/debian-12/prebuildfs/opt/bitnami/scripts/libhook.sh +++ b/bitnami/neo4j/5/debian-12/prebuildfs/opt/bitnami/scripts/libhook.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright VMware, Inc. +# Copyright Broadcom, Inc. All Rights Reserved. # SPDX-License-Identifier: APACHE-2.0 # # Library to use for scripts expected to be used as Kubernetes lifecycle hooks diff --git a/bitnami/neo4j/5/debian-12/prebuildfs/opt/bitnami/scripts/liblog.sh b/bitnami/neo4j/5/debian-12/prebuildfs/opt/bitnami/scripts/liblog.sh index 2a9e76a4d725..450f05bd823f 100644 --- a/bitnami/neo4j/5/debian-12/prebuildfs/opt/bitnami/scripts/liblog.sh +++ b/bitnami/neo4j/5/debian-12/prebuildfs/opt/bitnami/scripts/liblog.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright VMware, Inc. +# Copyright Broadcom, Inc. All Rights Reserved. # SPDX-License-Identifier: APACHE-2.0 # # Library for logging functions diff --git a/bitnami/neo4j/5/debian-12/prebuildfs/opt/bitnami/scripts/libnet.sh b/bitnami/neo4j/5/debian-12/prebuildfs/opt/bitnami/scripts/libnet.sh index b47c69a56825..004e426fba17 100644 --- a/bitnami/neo4j/5/debian-12/prebuildfs/opt/bitnami/scripts/libnet.sh +++ b/bitnami/neo4j/5/debian-12/prebuildfs/opt/bitnami/scripts/libnet.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright VMware, Inc. +# Copyright Broadcom, Inc. All Rights Reserved. # SPDX-License-Identifier: APACHE-2.0 # # Library for network functions @@ -8,6 +8,7 @@ # Load Generic Libraries . /opt/bitnami/scripts/liblog.sh +. /opt/bitnami/scripts/libvalidations.sh # Functions @@ -68,7 +69,12 @@ get_machine_ip() { error "Could not find any IP address associated to hostname ${hostname}" exit 1 fi - echo "${ip_addresses[0]}" + # Check if the first IP address is IPv6 to add brackets + if validate_ipv6 "${ip_addresses[0]}" ; then + echo "[${ip_addresses[0]}]" + else + echo "${ip_addresses[0]}" + fi } ######################## diff --git a/bitnami/neo4j/5/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh b/bitnami/neo4j/5/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh index c0500acee78d..9d908c48579b 100644 --- a/bitnami/neo4j/5/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh +++ b/bitnami/neo4j/5/debian-12/prebuildfs/opt/bitnami/scripts/libos.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright VMware, Inc. +# Copyright Broadcom, Inc. All Rights Reserved. # SPDX-License-Identifier: APACHE-2.0 # # Library for operating system actions diff --git a/bitnami/neo4j/5/debian-12/prebuildfs/opt/bitnami/scripts/libpersistence.sh b/bitnami/neo4j/5/debian-12/prebuildfs/opt/bitnami/scripts/libpersistence.sh index af6af64d6dd0..18445e7d27fa 100644 --- a/bitnami/neo4j/5/debian-12/prebuildfs/opt/bitnami/scripts/libpersistence.sh +++ b/bitnami/neo4j/5/debian-12/prebuildfs/opt/bitnami/scripts/libpersistence.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright VMware, Inc. +# Copyright Broadcom, Inc. All Rights Reserved. # SPDX-License-Identifier: APACHE-2.0 # # Bitnami persistence library diff --git a/bitnami/neo4j/5/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh b/bitnami/neo4j/5/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh index 107f54e6b5c9..1f9b33096b02 100644 --- a/bitnami/neo4j/5/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh +++ b/bitnami/neo4j/5/debian-12/prebuildfs/opt/bitnami/scripts/libservice.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright VMware, Inc. +# Copyright Broadcom, Inc. All Rights Reserved. # SPDX-License-Identifier: APACHE-2.0 # # Library for managing services @@ -132,7 +132,7 @@ generate_cron_conf() { mkdir -p /etc/cron.d if "$clean"; then cat > "/etc/cron.d/${service_name}" < "${monit_conf_dir}/${service_name}.conf${conf_suffix:-}" < "${logrotate_conf_dir}/${service_name}" -# Copyright VMware, Inc. +# Copyright Broadcom, Inc. All Rights Reserved. # SPDX-License-Identifier: APACHE-2.0 ${log_path} { @@ -402,7 +402,7 @@ generate_systemd_conf() { fi # Generate the Systemd unit cat > "$service_file" <