Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Releasing Neo4j 4.4.40 #18132

Merged
merged 1 commit into from
Dec 19, 2024
Merged

Releasing Neo4j 4.4.40 #18132

merged 1 commit into from
Dec 19, 2024

Conversation

neo-tobias
Copy link
Contributor

No description provided.

@neo-tobias neo-tobias requested a review from a team as a code owner December 18, 2024 07:22

This comment has been minimized.

Copy link

Diff for 86fc023:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 1a1bc90..b4bc501 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,15 +1,15 @@
 Maintainers: Jenny Owen <[email protected]> (@jennyowen), Eric Sporre <[email protected]> (@ericsporre), Tobias Ericsson <[email protected]> (@neo-tobias)
 GitRepo: https://github.com/neo4j/docker-neo4j-publish.git
 
-Tags: 4.4.39, 4.4.39-community, 4.4, 4.4-community
+Tags: 4.4.40, 4.4.40-community, 4.4, 4.4-community
 Architectures: amd64, arm64v8
-GitCommit: e0b93f39e18ba02d3c37677b70fd869070df0515
-Directory: 4.4.39/bullseye/community
+GitCommit: b8c0ca2e8dd585e338d74b191a2e370c0da14d92
+Directory: 4.4.40/bullseye/community
 
-Tags: 4.4.39-enterprise, 4.4-enterprise
+Tags: 4.4.40-enterprise, 4.4-enterprise
 Architectures: amd64, arm64v8
-GitCommit: e0b93f39e18ba02d3c37677b70fd869070df0515
-Directory: 4.4.39/bullseye/enterprise
+GitCommit: b8c0ca2e8dd585e338d74b191a2e370c0da14d92
+Directory: 4.4.40/bullseye/enterprise
 
 Tags: 5.26.0-community-bullseye, 5.26-community-bullseye, 5-community-bullseye, 5.26.0-community, 5.26-community, 5-community, 5.26.0-bullseye, 5.26-bullseye, 5-bullseye, 5.26.0, 5.26, 5, community-bullseye, community, bullseye, latest
 Architectures: amd64, arm64v8
diff --git a/_bashbrew-list b/_bashbrew-list
index 9790ab2..59adc5e 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,9 +1,9 @@
 neo4j:4.4
 neo4j:4.4-community
 neo4j:4.4-enterprise
-neo4j:4.4.39
-neo4j:4.4.39-community
-neo4j:4.4.39-enterprise
+neo4j:4.4.40
+neo4j:4.4.40-community
+neo4j:4.4.40-enterprise
 neo4j:5
 neo4j:5-bullseye
 neo4j:5-community
diff --git a/neo4j_4.4-community/Dockerfile b/neo4j_4.4-community/Dockerfile
index 82c20b1..4f21eb8 100644
--- a/neo4j_4.4-community/Dockerfile
+++ b/neo4j_4.4-community/Dockerfile
@@ -2,12 +2,12 @@ FROM debian:bullseye-slim
 ENV JAVA_HOME=/opt/java/openjdk
 COPY --from=eclipse-temurin:11 $JAVA_HOME $JAVA_HOME
 ENV PATH="${JAVA_HOME}/bin:${PATH}" \
-    NEO4J_SHA256=0ed842590ef87186c2fa6843c0233756b1a25b631eb5d740bddf85896fbcce04 \
-    NEO4J_TARBALL=neo4j-community-4.4.39-unix.tar.gz \
+    NEO4J_SHA256=329761a647bfcee9b729d09a353c4a811772a6aa6b22dad451d3d065538c3447 \
+    NEO4J_TARBALL=neo4j-community-4.4.40-unix.tar.gz \
     NEO4J_EDITION=community \
     NEO4J_HOME="/var/lib/neo4j" \
     LANG=C.UTF-8
-ARG NEO4J_URI=https://dist.neo4j.org/neo4j-community-4.4.39-unix.tar.gz
+ARG NEO4J_URI=https://dist.neo4j.org/neo4j-community-4.4.40-unix.tar.gz
 
 RUN addgroup --gid 7474 --system neo4j && adduser --uid 7474 --system --no-create-home --home "${NEO4J_HOME}" --ingroup neo4j neo4j
 
diff --git a/neo4j_4.4-community/local-package/docker-entrypoint.sh b/neo4j_4.4-community/local-package/docker-entrypoint.sh
index 902de5d..cbd0d15 100755
--- a/neo4j_4.4-community/local-package/docker-entrypoint.sh
+++ b/neo4j_4.4-community/local-package/docker-entrypoint.sh
@@ -159,7 +159,7 @@ function load_plugin_from_url
         echo >&2 "ERROR: could not query ${_versions_json_url} for plugin compatibility information.
     This could indicate a problem with your network or this container's network settings.
     Neo4j will continue to start, but \"${_plugin_name}\" will not be loaded."
-        return
+        return 1
     fi
     local _plugin_jar_url="$(echo "${_versions_json}" | jq -L/startup --raw-output "import \"semver\" as lib; [ .[] | select(.neo4j|lib::semver(\"${_neo4j_version}\")) ] | min_by(.neo4j) | .jar")"
     if [[ -z "${_plugin_jar_url}" ]] || [[ "${_plugin_jar_url}" == "null" ]]; then
@@ -238,12 +238,15 @@ function install_neo4j_labs_plugins
         if [ "${_location}" != "null" -a -n "$(shopt -s nullglob; echo ${_location})" ]; then
             debug_msg "$plugin_name is already in the container at ${_location}"
             load_plugin_from_location "${plugin_name}" "${_location}"
+            debug_msg "Applying plugin specific configurations."
+            apply_plugin_default_configuration "${plugin_name}" "${_old_config}"
         else
             debug_msg "$plugin_name must be downloaded."
-            load_plugin_from_url "${plugin_name}"
-        fi
+            if load_plugin_from_url "${plugin_name}"; then
                 debug_msg "Applying plugin specific configurations."
                 apply_plugin_default_configuration "${plugin_name}" "${_old_config}"
+            fi
+        fi
     done
     rm "${_old_config}"
 }
diff --git a/neo4j_4.4-enterprise/Dockerfile b/neo4j_4.4-enterprise/Dockerfile
index 2adb2e4..dde905d 100644
--- a/neo4j_4.4-enterprise/Dockerfile
+++ b/neo4j_4.4-enterprise/Dockerfile
@@ -2,12 +2,12 @@ FROM debian:bullseye-slim
 ENV JAVA_HOME=/opt/java/openjdk
 COPY --from=eclipse-temurin:11 $JAVA_HOME $JAVA_HOME
 ENV PATH="${JAVA_HOME}/bin:${PATH}" \
-    NEO4J_SHA256=9f1e68c0dbea7ec6fbf1baa4a32510588d675f4692d4ae9d0a7e8d820cd9b308 \
-    NEO4J_TARBALL=neo4j-enterprise-4.4.39-unix.tar.gz \
+    NEO4J_SHA256=6e844a76066d8f7bf200a97e077a385347e9f7ca780392d5f70b19ceea782016 \
+    NEO4J_TARBALL=neo4j-enterprise-4.4.40-unix.tar.gz \
     NEO4J_EDITION=enterprise \
     NEO4J_HOME="/var/lib/neo4j" \
     LANG=C.UTF-8
-ARG NEO4J_URI=https://dist.neo4j.org/neo4j-enterprise-4.4.39-unix.tar.gz
+ARG NEO4J_URI=https://dist.neo4j.org/neo4j-enterprise-4.4.40-unix.tar.gz
 
 RUN addgroup --gid 7474 --system neo4j && adduser --uid 7474 --system --no-create-home --home "${NEO4J_HOME}" --ingroup neo4j neo4j
 
diff --git a/neo4j_4.4-enterprise/local-package/docker-entrypoint.sh b/neo4j_4.4-enterprise/local-package/docker-entrypoint.sh
index 902de5d..cbd0d15 100755
--- a/neo4j_4.4-enterprise/local-package/docker-entrypoint.sh
+++ b/neo4j_4.4-enterprise/local-package/docker-entrypoint.sh
@@ -159,7 +159,7 @@ function load_plugin_from_url
         echo >&2 "ERROR: could not query ${_versions_json_url} for plugin compatibility information.
     This could indicate a problem with your network or this container's network settings.
     Neo4j will continue to start, but \"${_plugin_name}\" will not be loaded."
-        return
+        return 1
     fi
     local _plugin_jar_url="$(echo "${_versions_json}" | jq -L/startup --raw-output "import \"semver\" as lib; [ .[] | select(.neo4j|lib::semver(\"${_neo4j_version}\")) ] | min_by(.neo4j) | .jar")"
     if [[ -z "${_plugin_jar_url}" ]] || [[ "${_plugin_jar_url}" == "null" ]]; then
@@ -238,12 +238,15 @@ function install_neo4j_labs_plugins
         if [ "${_location}" != "null" -a -n "$(shopt -s nullglob; echo ${_location})" ]; then
             debug_msg "$plugin_name is already in the container at ${_location}"
             load_plugin_from_location "${plugin_name}" "${_location}"
+            debug_msg "Applying plugin specific configurations."
+            apply_plugin_default_configuration "${plugin_name}" "${_old_config}"
         else
             debug_msg "$plugin_name must be downloaded."
-            load_plugin_from_url "${plugin_name}"
-        fi
+            if load_plugin_from_url "${plugin_name}"; then
                 debug_msg "Applying plugin specific configurations."
                 apply_plugin_default_configuration "${plugin_name}" "${_old_config}"
+            fi
+        fi
     done
     rm "${_old_config}"
 }

Relevant Maintainers:

@tianon tianon merged commit 38de79f into docker-library:master Dec 19, 2024
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants