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.35 #17120

Merged
merged 1 commit into from
Jul 5, 2024
Merged

Releasing Neo4j 4.4.35 #17120

merged 1 commit into from
Jul 5, 2024

Conversation

ericsporre
Copy link
Contributor

Thank you!

@ericsporre ericsporre requested a review from a team as a code owner July 4, 2024 14:33
Copy link

github-actions bot commented Jul 4, 2024

Diff for 378dbf5:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 2bdf463..519154a 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,15 +1,15 @@
 Maintainers: Jenny Owen <[email protected]> (@jennyowen), Gustav Lindroth <[email protected]> (@glindroth), Eric Sporre <[email protected]> (@ericsporre)
 GitRepo: https://github.com/neo4j/docker-neo4j-publish.git
 
-Tags: 4.4.34, 4.4.34-community, 4.4, 4.4-community
+Tags: 4.4.35, 4.4.35-community, 4.4, 4.4-community
 Architectures: amd64, arm64v8
-GitCommit: d8543a8aec237f8d127f233c74f09cf3c76f9051
-Directory: 4.4.34/bullseye/community
+GitCommit: 62fed0e66f4f437924853a02aced6ffaf2b507cd
+Directory: 4.4.35/bullseye/community
 
-Tags: 4.4.34-enterprise, 4.4-enterprise
+Tags: 4.4.35-enterprise, 4.4-enterprise
 Architectures: amd64, arm64v8
-GitCommit: d8543a8aec237f8d127f233c74f09cf3c76f9051
-Directory: 4.4.34/bullseye/enterprise
+GitCommit: 62fed0e66f4f437924853a02aced6ffaf2b507cd
+Directory: 4.4.35/bullseye/enterprise
 
 Tags: 5.21.0-community-bullseye, 5.21-community-bullseye, 5-community-bullseye, 5.21.0-community, 5.21-community, 5-community, 5.21.0-bullseye, 5.21-bullseye, 5-bullseye, 5.21.0, 5.21, 5, community-bullseye, community, bullseye, latest
 Architectures: amd64, arm64v8
diff --git a/_bashbrew-list b/_bashbrew-list
index 64fa8ad..f53aac2 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.34
-neo4j:4.4.34-community
-neo4j:4.4.34-enterprise
+neo4j:4.4.35
+neo4j:4.4.35-community
+neo4j:4.4.35-enterprise
 neo4j:5
 neo4j:5-bullseye
 neo4j:5-community
diff --git a/neo4j_4.4-community/Dockerfile b/neo4j_4.4-community/Dockerfile
index 14f2eb3..df65a8b 100644
--- a/neo4j_4.4-community/Dockerfile
+++ b/neo4j_4.4-community/Dockerfile
@@ -2,11 +2,11 @@ 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=18f792e50d6022984ce40012dfe5525a91fca21fa657a84a0a1a0f8d6104cd30 \
-    NEO4J_TARBALL=neo4j-community-4.4.34-unix.tar.gz \
+    NEO4J_SHA256=a31d88a599c7581da325b7768830898dcc2c454af4a8ebb52d52b170a366ada3 \
+    NEO4J_TARBALL=neo4j-community-4.4.35-unix.tar.gz \
     NEO4J_EDITION=community \
     NEO4J_HOME="/var/lib/neo4j"
-ARG NEO4J_URI=https://dist.neo4j.org/neo4j-community-4.4.34-unix.tar.gz
+ARG NEO4J_URI=https://dist.neo4j.org/neo4j-community-4.4.35-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 b9bced5..2b105f4 100755
--- a/neo4j_4.4-community/local-package/docker-entrypoint.sh
+++ b/neo4j_4.4-community/local-package/docker-entrypoint.sh
@@ -153,14 +153,21 @@ function load_plugin_from_url
 
     # Now we call out to github to get the versions.json for this plugin and we parse that to find the url for the correct plugin jar for our neo4j version
     echo "Fetching versions.json for Plugin '${_plugin_name}' from ${_versions_json_url}"
-    local _versions_json="$(wget -q --timeout 300 --tries 30 -O - "${_versions_json_url}")"
+    local _versions_json
+    if ! _versions_json="$(wget -q --timeout 300 --tries 30 -O - "${_versions_json_url}")"; then
+        debug_msg "ERROR: could not fetch '${_versions_json}'"
+        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
+    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
         debug_msg "ERROR: '${_versions_json_url}' does not contain an entry for ${_neo4j_version}"
-        echo >&2 "ERROR: No compatible \"${_plugin_name}\" plugin found for Neo4j ${_neo4j_version}."
-        echo >&2 "This can happen with the newest Neo4j versions when a compatible plugin has not yet been released."
-        echo >&2 "You can either use an older version of Neo4j, or continue without ${_plugin_name}."
-        echo >&2 "Neo4j will continue to start, but \"${_plugin_name}\" will not be loaded."
+        echo >&2 "ERROR: No compatible \"${_plugin_name}\" plugin found for Neo4j ${_neo4j_version} ${NEO4J_EDITION}.
+    This can happen with the newest Neo4j versions when a compatible plugin has not yet been released.
+    You can either use an older version of Neo4j, or continue without ${_plugin_name}.
+    Neo4j will continue to start, but \"${_plugin_name}\" will not be loaded."
     else
         echo "Installing Plugin '${_plugin_name}' from ${_plugin_jar_url} to ${_destination} "
         wget -q --timeout 300 --tries 30 --output-document="${_destination}" "${_plugin_jar_url}"
@@ -317,7 +324,7 @@ function set_initial_password
                 extra_args+=("--verbose")
             fi
             debug_msg "Setting initial password"
-            debug_msg "${neo4j_admin_cmd} set-initial-password ${password} ${extra_args[*]}"
+            debug_msg "${neo4j_admin_cmd} set-initial-password ***** ${extra_args[*]}"
             if debugging_enabled; then
                 # don't suppress any output or errors in debugging mode
                 ${neo4j_admin_cmd} set-initial-password "${password}" "${extra_args[@]}"
diff --git a/neo4j_4.4-enterprise/Dockerfile b/neo4j_4.4-enterprise/Dockerfile
index c96d82b..d081bef 100644
--- a/neo4j_4.4-enterprise/Dockerfile
+++ b/neo4j_4.4-enterprise/Dockerfile
@@ -2,11 +2,11 @@ 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=cb44390774e4107279e9a5d392fd8e59a9413e28efacec845b492d4e4879b6ab \
-    NEO4J_TARBALL=neo4j-enterprise-4.4.34-unix.tar.gz \
+    NEO4J_SHA256=b24c5cd6b1651b037d382e3d0d906410d63b857ed99dcb288a77f574f333fd52 \
+    NEO4J_TARBALL=neo4j-enterprise-4.4.35-unix.tar.gz \
     NEO4J_EDITION=enterprise \
     NEO4J_HOME="/var/lib/neo4j"
-ARG NEO4J_URI=https://dist.neo4j.org/neo4j-enterprise-4.4.34-unix.tar.gz
+ARG NEO4J_URI=https://dist.neo4j.org/neo4j-enterprise-4.4.35-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 b9bced5..2b105f4 100755
--- a/neo4j_4.4-enterprise/local-package/docker-entrypoint.sh
+++ b/neo4j_4.4-enterprise/local-package/docker-entrypoint.sh
@@ -153,14 +153,21 @@ function load_plugin_from_url
 
     # Now we call out to github to get the versions.json for this plugin and we parse that to find the url for the correct plugin jar for our neo4j version
     echo "Fetching versions.json for Plugin '${_plugin_name}' from ${_versions_json_url}"
-    local _versions_json="$(wget -q --timeout 300 --tries 30 -O - "${_versions_json_url}")"
+    local _versions_json
+    if ! _versions_json="$(wget -q --timeout 300 --tries 30 -O - "${_versions_json_url}")"; then
+        debug_msg "ERROR: could not fetch '${_versions_json}'"
+        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
+    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
         debug_msg "ERROR: '${_versions_json_url}' does not contain an entry for ${_neo4j_version}"
-        echo >&2 "ERROR: No compatible \"${_plugin_name}\" plugin found for Neo4j ${_neo4j_version}."
-        echo >&2 "This can happen with the newest Neo4j versions when a compatible plugin has not yet been released."
-        echo >&2 "You can either use an older version of Neo4j, or continue without ${_plugin_name}."
-        echo >&2 "Neo4j will continue to start, but \"${_plugin_name}\" will not be loaded."
+        echo >&2 "ERROR: No compatible \"${_plugin_name}\" plugin found for Neo4j ${_neo4j_version} ${NEO4J_EDITION}.
+    This can happen with the newest Neo4j versions when a compatible plugin has not yet been released.
+    You can either use an older version of Neo4j, or continue without ${_plugin_name}.
+    Neo4j will continue to start, but \"${_plugin_name}\" will not be loaded."
     else
         echo "Installing Plugin '${_plugin_name}' from ${_plugin_jar_url} to ${_destination} "
         wget -q --timeout 300 --tries 30 --output-document="${_destination}" "${_plugin_jar_url}"
@@ -317,7 +324,7 @@ function set_initial_password
                 extra_args+=("--verbose")
             fi
             debug_msg "Setting initial password"
-            debug_msg "${neo4j_admin_cmd} set-initial-password ${password} ${extra_args[*]}"
+            debug_msg "${neo4j_admin_cmd} set-initial-password ***** ${extra_args[*]}"
             if debugging_enabled; then
                 # don't suppress any output or errors in debugging mode
                 ${neo4j_admin_cmd} set-initial-password "${password}" "${extra_args[@]}"

Relevant Maintainers:

@tianon tianon merged commit 2b9378f into docker-library:master Jul 5, 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.

2 participants