-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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.3.11 and 4.4.5 #12113
Conversation
Thank you!
Diff for cd51a53:diff --git a/_bashbrew-cat b/_bashbrew-cat
index de58371..a47f9b1 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -305,14 +305,22 @@ Tags: 4.3.9-enterprise
GitCommit: 36ecdad3eda8fcdee6fa46af683a2f76919b737d
Directory: 4.3.9/enterprise
-Tags: 4.3.10, 4.3.10-community, 4.3, 4.3-community
+Tags: 4.3.10, 4.3.10-community
GitCommit: 713a36ed7a2c465dcf8d147b5fdf9a891802572b
Directory: 4.3.10/community
-Tags: 4.3.10-enterprise, 4.3-enterprise
+Tags: 4.3.10-enterprise
GitCommit: 713a36ed7a2c465dcf8d147b5fdf9a891802572b
Directory: 4.3.10/enterprise
+Tags: 4.3.11, 4.3.11-community, 4.3, 4.3-community
+GitCommit: 08f1bf3eef3e02f53f0e964e04f97b739db204d7
+Directory: 4.3.11/community
+
+Tags: 4.3.11-enterprise, 4.3-enterprise
+GitCommit: 08f1bf3eef3e02f53f0e964e04f97b739db204d7
+Directory: 4.3.11/enterprise
+
Tags: 4.4.0, 4.4.0-community
Architectures: amd64, arm64v8
GitCommit: c3cd89287e0295cbac5ef85de7210ac879934243
@@ -353,12 +361,22 @@ Architectures: amd64, arm64v8
GitCommit: be7e16fe413f2aa6b5091fc8f6c75787c5894621
Directory: 4.4.3/enterprise
-Tags: 4.4.4, 4.4.4-community, 4.4, 4.4-community, community, latest
+Tags: 4.4.4, 4.4.4-community
Architectures: amd64, arm64v8
GitCommit: 876cf20dc47018e528d01720668b7d6027c6cf04
Directory: 4.4.4/community
-Tags: 4.4.4-enterprise, 4.4-enterprise, enterprise
+Tags: 4.4.4-enterprise
Architectures: amd64, arm64v8
GitCommit: 876cf20dc47018e528d01720668b7d6027c6cf04
Directory: 4.4.4/enterprise
+
+Tags: 4.4.5, 4.4.5-community, 4.4, 4.4-community, community, latest
+Architectures: amd64, arm64v8
+GitCommit: e7d2c2fde76bc164b386bec35af5533c6f195873
+Directory: 4.4.5/community
+
+Tags: 4.4.5-enterprise, 4.4-enterprise, enterprise
+Architectures: amd64, arm64v8
+GitCommit: e7d2c2fde76bc164b386bec35af5533c6f195873
+Directory: 4.4.5/enterprise
diff --git a/_bashbrew-list b/_bashbrew-list
index adb17b3..802a5ad 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -124,6 +124,9 @@ neo4j:4.3.9-enterprise
neo4j:4.3.10
neo4j:4.3.10-community
neo4j:4.3.10-enterprise
+neo4j:4.3.11
+neo4j:4.3.11-community
+neo4j:4.3.11-enterprise
neo4j:4.4
neo4j:4.4-community
neo4j:4.4-enterprise
@@ -142,6 +145,9 @@ neo4j:4.4.3-enterprise
neo4j:4.4.4
neo4j:4.4.4-community
neo4j:4.4.4-enterprise
+neo4j:4.4.5
+neo4j:4.4.5-community
+neo4j:4.4.5-enterprise
neo4j:community
neo4j:enterprise
neo4j:latest
diff --git a/neo4j_4.3-community/Dockerfile b/neo4j_4.3-community/Dockerfile
index b752821..29e7f90 100644
--- a/neo4j_4.3-community/Dockerfile
+++ b/neo4j_4.3-community/Dockerfile
@@ -1,22 +1,17 @@
FROM openjdk:11-jdk-slim
-ENV NEO4J_SHA256=94b565eb1f264e7b7b39922163fa5979dbefc0abb9a132e5849285db60f5385a \
- NEO4J_TARBALL=neo4j-community-4.3.10-unix.tar.gz \
+ENV NEO4J_SHA256=e88a340d16e0e06d35808aed3e4464683c9ad6755c3aed2feb86ca1f143c3534 \
+ NEO4J_TARBALL=neo4j-community-4.3.11-unix.tar.gz \
NEO4J_EDITION=community \
NEO4J_HOME="/var/lib/neo4j"
-ARG NEO4J_URI=https://dist.neo4j.org/neo4j-community-4.3.10-unix.tar.gz
-ARG TINI_SHA256="12d20136605531b09a2c2dac02ccee85e1b874eb322ef6baf7561cd93f93c855"
-ARG TINI_URI="https://github.com/krallin/tini/releases/download/v0.18.0/tini"
+ARG NEO4J_URI=https://dist.neo4j.org/neo4j-community-4.3.11-unix.tar.gz
RUN addgroup --gid 7474 --system neo4j && adduser --uid 7474 --system --no-create-home --home "${NEO4J_HOME}" --ingroup neo4j neo4j
-COPY ./local-package/* /tmp/
+COPY ./local-package/* /startup/
RUN apt update \
- && apt install -y curl wget gosu jq \
- && curl -L --fail --silent --show-error ${TINI_URI} > /sbin/tini \
- && echo "${TINI_SHA256} /sbin/tini" | sha256sum -c --strict --quiet \
- && chmod +x /sbin/tini \
+ && apt install -y curl wget gosu jq tini \
&& curl --fail --silent --show-error --location --remote-name ${NEO4J_URI} \
&& echo "${NEO4J_SHA256} ${NEO4J_TARBALL}" | sha256sum -c --strict --quiet \
&& tar --extract --file ${NEO4J_TARBALL} --directory /var/lib \
@@ -32,10 +27,10 @@ RUN apt update \
&& chmod -R 777 "${NEO4J_HOME}" \
&& ln -s /data "${NEO4J_HOME}"/data \
&& ln -s /logs "${NEO4J_HOME}"/logs \
- && mv /tmp/neo4jlabs-plugins.json /neo4jlabs-plugins.json \
- && rm -rf /tmp/* \
- && rm -rf /var/lib/apt/lists/* \
- && apt-get -y purge --auto-remove curl
+ && ln -s /startup/docker-entrypoint.sh /docker-entrypoint.sh \
+ && apt-get -y purge --auto-remove curl \
+ && rm -rf /var/lib/apt/lists/*
+
ENV PATH "${NEO4J_HOME}"/bin:$PATH
@@ -43,9 +38,7 @@ WORKDIR "${NEO4J_HOME}"
VOLUME /data /logs
-COPY docker-entrypoint.sh /docker-entrypoint.sh
-
EXPOSE 7474 7473 7687
-ENTRYPOINT ["/sbin/tini", "-g", "--", "/docker-entrypoint.sh"]
+ENTRYPOINT ["tini", "-g", "--", "/startup/docker-entrypoint.sh"]
CMD ["neo4j"]
diff --git a/neo4j_4.2-community/local-package/docker-entrypoint.sh b/neo4j_4.3-community/local-package/docker-entrypoint.sh
similarity index 96%
copy from neo4j_4.2-community/local-package/docker-entrypoint.sh
copy to neo4j_4.3-community/local-package/docker-entrypoint.sh
index c19c765..db39a64 100755
--- a/neo4j_4.2-community/local-package/docker-entrypoint.sh
+++ b/neo4j_4.3-community/local-package/docker-entrypoint.sh
@@ -513,15 +513,30 @@ if [ "${cmd}" == "dump-config" ]; then
exit 0
fi
+# this prints out a command for us to run.
+# the command is something like: `java ...[lots of java options]... neo4j.mainClass ...[some neo4j options]...`
+function get_neo4j_run_cmd {
+
+ local extraArgs=()
+
+ if [ "${EXTENDED_CONF+"yes"}" == "yes" ]; then
+ extraArgs+=("--expand-commands")
+ fi
+
+ if running_as_root; then
+ gosu neo4j:neo4j neo4j console --dry-run "${extraArgs[@]}"
+ else
+ neo4j console --dry-run "${extraArgs[@]}"
+ fi
+}
+
# Use su-exec to drop privileges to neo4j user
# Note that su-exec, despite its name, does not replicate the
# functionality of exec, so we need to use both
if [ "${cmd}" == "neo4j" ]; then
- if [ "${EXTENDED_CONF+"yes"}" == "yes" ]; then
- ${exec_cmd} neo4j console --expand-commands
- else
- ${exec_cmd} neo4j console
- fi
+ # separate declaration and use of get_neo4j_run_cmd so that error codes are correctly surfaced
+ neo4j_console_cmd="$(get_neo4j_run_cmd)"
+ eval "${exec_cmd} ${neo4j_console_cmd?:No Neo4j command was generated}"
else
${exec_cmd} "$@"
fi
diff --git a/neo4j_3.5-community/local-package/semver.jq b/neo4j_4.3-community/local-package/semver.jq
similarity index 100%
copy from neo4j_3.5-community/local-package/semver.jq
copy to neo4j_4.3-community/local-package/semver.jq
diff --git a/neo4j_4.3-enterprise/Dockerfile b/neo4j_4.3-enterprise/Dockerfile
index 70171a7..dda7520 100644
--- a/neo4j_4.3-enterprise/Dockerfile
+++ b/neo4j_4.3-enterprise/Dockerfile
@@ -1,22 +1,17 @@
FROM openjdk:11-jdk-slim
-ENV NEO4J_SHA256=fc3b3ff5a4994e3a72f01a393f995dbc97722c5635d7ed4a95f99674fe153a45 \
- NEO4J_TARBALL=neo4j-enterprise-4.3.10-unix.tar.gz \
+ENV NEO4J_SHA256=31998ed45b830f35a52be8fce261e10063b21a2f5c91491102921a4e86ca8eab \
+ NEO4J_TARBALL=neo4j-enterprise-4.3.11-unix.tar.gz \
NEO4J_EDITION=enterprise \
NEO4J_HOME="/var/lib/neo4j"
-ARG NEO4J_URI=https://dist.neo4j.org/neo4j-enterprise-4.3.10-unix.tar.gz
-ARG TINI_SHA256="12d20136605531b09a2c2dac02ccee85e1b874eb322ef6baf7561cd93f93c855"
-ARG TINI_URI="https://github.com/krallin/tini/releases/download/v0.18.0/tini"
+ARG NEO4J_URI=https://dist.neo4j.org/neo4j-enterprise-4.3.11-unix.tar.gz
RUN addgroup --gid 7474 --system neo4j && adduser --uid 7474 --system --no-create-home --home "${NEO4J_HOME}" --ingroup neo4j neo4j
-COPY ./local-package/* /tmp/
+COPY ./local-package/* /startup/
RUN apt update \
- && apt install -y curl wget gosu jq \
- && curl -L --fail --silent --show-error ${TINI_URI} > /sbin/tini \
- && echo "${TINI_SHA256} /sbin/tini" | sha256sum -c --strict --quiet \
- && chmod +x /sbin/tini \
+ && apt install -y curl wget gosu jq tini \
&& curl --fail --silent --show-error --location --remote-name ${NEO4J_URI} \
&& echo "${NEO4J_SHA256} ${NEO4J_TARBALL}" | sha256sum -c --strict --quiet \
&& tar --extract --file ${NEO4J_TARBALL} --directory /var/lib \
@@ -32,10 +27,10 @@ RUN apt update \
&& chmod -R 777 "${NEO4J_HOME}" \
&& ln -s /data "${NEO4J_HOME}"/data \
&& ln -s /logs "${NEO4J_HOME}"/logs \
- && mv /tmp/neo4jlabs-plugins.json /neo4jlabs-plugins.json \
- && rm -rf /tmp/* \
- && rm -rf /var/lib/apt/lists/* \
- && apt-get -y purge --auto-remove curl
+ && ln -s /startup/docker-entrypoint.sh /docker-entrypoint.sh \
+ && apt-get -y purge --auto-remove curl \
+ && rm -rf /var/lib/apt/lists/*
+
ENV PATH "${NEO4J_HOME}"/bin:$PATH
@@ -43,9 +38,7 @@ WORKDIR "${NEO4J_HOME}"
VOLUME /data /logs
-COPY docker-entrypoint.sh /docker-entrypoint.sh
-
EXPOSE 7474 7473 7687
-ENTRYPOINT ["/sbin/tini", "-g", "--", "/docker-entrypoint.sh"]
+ENTRYPOINT ["tini", "-g", "--", "/startup/docker-entrypoint.sh"]
CMD ["neo4j"]
diff --git a/neo4j_4.2-community/local-package/docker-entrypoint.sh b/neo4j_4.3-enterprise/local-package/docker-entrypoint.sh
similarity index 96%
copy from neo4j_4.2-community/local-package/docker-entrypoint.sh
copy to neo4j_4.3-enterprise/local-package/docker-entrypoint.sh
index c19c765..db39a64 100755
--- a/neo4j_4.2-community/local-package/docker-entrypoint.sh
+++ b/neo4j_4.3-enterprise/local-package/docker-entrypoint.sh
@@ -513,15 +513,30 @@ if [ "${cmd}" == "dump-config" ]; then
exit 0
fi
+# this prints out a command for us to run.
+# the command is something like: `java ...[lots of java options]... neo4j.mainClass ...[some neo4j options]...`
+function get_neo4j_run_cmd {
+
+ local extraArgs=()
+
+ if [ "${EXTENDED_CONF+"yes"}" == "yes" ]; then
+ extraArgs+=("--expand-commands")
+ fi
+
+ if running_as_root; then
+ gosu neo4j:neo4j neo4j console --dry-run "${extraArgs[@]}"
+ else
+ neo4j console --dry-run "${extraArgs[@]}"
+ fi
+}
+
# Use su-exec to drop privileges to neo4j user
# Note that su-exec, despite its name, does not replicate the
# functionality of exec, so we need to use both
if [ "${cmd}" == "neo4j" ]; then
- if [ "${EXTENDED_CONF+"yes"}" == "yes" ]; then
- ${exec_cmd} neo4j console --expand-commands
- else
- ${exec_cmd} neo4j console
- fi
+ # separate declaration and use of get_neo4j_run_cmd so that error codes are correctly surfaced
+ neo4j_console_cmd="$(get_neo4j_run_cmd)"
+ eval "${exec_cmd} ${neo4j_console_cmd?:No Neo4j command was generated}"
else
${exec_cmd} "$@"
fi
diff --git a/neo4j_3.5-community/local-package/semver.jq b/neo4j_4.3-enterprise/local-package/semver.jq
similarity index 100%
copy from neo4j_3.5-community/local-package/semver.jq
copy to neo4j_4.3-enterprise/local-package/semver.jq
diff --git a/neo4j_4.3-community/Dockerfile b/neo4j_4.3.10-community/Dockerfile
similarity index 100%
copy from neo4j_4.3-community/Dockerfile
copy to neo4j_4.3.10-community/Dockerfile
diff --git a/neo4j_4.3-community/docker-entrypoint.sh b/neo4j_4.3.10-community/docker-entrypoint.sh
similarity index 100%
rename from neo4j_4.3-community/docker-entrypoint.sh
rename to neo4j_4.3.10-community/docker-entrypoint.sh
diff --git a/neo4j_3.5-community/local-package/.sentinel b/neo4j_4.3.10-community/local-package/.sentinel
similarity index 100%
copy from neo4j_3.5-community/local-package/.sentinel
copy to neo4j_4.3.10-community/local-package/.sentinel
diff --git a/neo4j_3.5-community/local-package/neo4jlabs-plugins.json b/neo4j_4.3.10-community/local-package/neo4jlabs-plugins.json
similarity index 100%
copy from neo4j_3.5-community/local-package/neo4jlabs-plugins.json
copy to neo4j_4.3.10-community/local-package/neo4jlabs-plugins.json
diff --git a/neo4j_4.3-enterprise/Dockerfile b/neo4j_4.3.10-enterprise/Dockerfile
similarity index 100%
copy from neo4j_4.3-enterprise/Dockerfile
copy to neo4j_4.3.10-enterprise/Dockerfile
diff --git a/neo4j_4.3-enterprise/docker-entrypoint.sh b/neo4j_4.3.10-enterprise/docker-entrypoint.sh
similarity index 100%
rename from neo4j_4.3-enterprise/docker-entrypoint.sh
rename to neo4j_4.3.10-enterprise/docker-entrypoint.sh
diff --git a/neo4j_3.5-community/local-package/.sentinel b/neo4j_4.3.10-enterprise/local-package/.sentinel
similarity index 100%
copy from neo4j_3.5-community/local-package/.sentinel
copy to neo4j_4.3.10-enterprise/local-package/.sentinel
diff --git a/neo4j_3.5-community/local-package/neo4jlabs-plugins.json b/neo4j_4.3.10-enterprise/local-package/neo4jlabs-plugins.json
similarity index 100%
copy from neo4j_3.5-community/local-package/neo4jlabs-plugins.json
copy to neo4j_4.3.10-enterprise/local-package/neo4jlabs-plugins.json
diff --git a/neo4j_latest/Dockerfile b/neo4j_4.4.4-community/Dockerfile
similarity index 100%
copy from neo4j_latest/Dockerfile
copy to neo4j_4.4.4-community/Dockerfile
diff --git a/neo4j_3.5-community/local-package/.sentinel b/neo4j_4.4.4-community/local-package/.sentinel
similarity index 100%
copy from neo4j_3.5-community/local-package/.sentinel
copy to neo4j_4.4.4-community/local-package/.sentinel
diff --git a/neo4j_enterprise/local-package/docker-entrypoint.sh b/neo4j_4.4.4-community/local-package/docker-entrypoint.sh
similarity index 100%
copy from neo4j_enterprise/local-package/docker-entrypoint.sh
copy to neo4j_4.4.4-community/local-package/docker-entrypoint.sh
diff --git a/neo4j_3.5-community/local-package/neo4jlabs-plugins.json b/neo4j_4.4.4-community/local-package/neo4jlabs-plugins.json
similarity index 100%
copy from neo4j_3.5-community/local-package/neo4jlabs-plugins.json
copy to neo4j_4.4.4-community/local-package/neo4jlabs-plugins.json
diff --git a/neo4j_3.5-community/local-package/semver.jq b/neo4j_4.4.4-community/local-package/semver.jq
similarity index 100%
copy from neo4j_3.5-community/local-package/semver.jq
copy to neo4j_4.4.4-community/local-package/semver.jq
diff --git a/neo4j_enterprise/Dockerfile b/neo4j_4.4.4-enterprise/Dockerfile
similarity index 100%
copy from neo4j_enterprise/Dockerfile
copy to neo4j_4.4.4-enterprise/Dockerfile
diff --git a/neo4j_3.5-community/local-package/.sentinel b/neo4j_4.4.4-enterprise/local-package/.sentinel
similarity index 100%
copy from neo4j_3.5-community/local-package/.sentinel
copy to neo4j_4.4.4-enterprise/local-package/.sentinel
diff --git a/neo4j_enterprise/local-package/docker-entrypoint.sh b/neo4j_4.4.4-enterprise/local-package/docker-entrypoint.sh
similarity index 100%
copy from neo4j_enterprise/local-package/docker-entrypoint.sh
copy to neo4j_4.4.4-enterprise/local-package/docker-entrypoint.sh
diff --git a/neo4j_3.5-community/local-package/neo4jlabs-plugins.json b/neo4j_4.4.4-enterprise/local-package/neo4jlabs-plugins.json
similarity index 100%
copy from neo4j_3.5-community/local-package/neo4jlabs-plugins.json
copy to neo4j_4.4.4-enterprise/local-package/neo4jlabs-plugins.json
diff --git a/neo4j_3.5-community/local-package/semver.jq b/neo4j_4.4.4-enterprise/local-package/semver.jq
similarity index 100%
copy from neo4j_3.5-community/local-package/semver.jq
copy to neo4j_4.4.4-enterprise/local-package/semver.jq
diff --git a/neo4j_enterprise/Dockerfile b/neo4j_enterprise/Dockerfile
index b519078..e770594 100644
--- a/neo4j_enterprise/Dockerfile
+++ b/neo4j_enterprise/Dockerfile
@@ -1,10 +1,10 @@
FROM openjdk:11-jdk-slim
-ENV NEO4J_SHA256=f3b815903fd6ac3fc0c997fa0d9af09eda0b3bdbbb239b4b496474d4e61b9da3 \
- NEO4J_TARBALL=neo4j-enterprise-4.4.4-unix.tar.gz \
+ENV NEO4J_SHA256=c89c19d93db0bcb8e5eae36f1f56dab4e46f8b235b3f2605c64a8b9b4b32ba13 \
+ NEO4J_TARBALL=neo4j-enterprise-4.4.5-unix.tar.gz \
NEO4J_EDITION=enterprise \
NEO4J_HOME="/var/lib/neo4j"
-ARG NEO4J_URI=https://dist.neo4j.org/neo4j-enterprise-4.4.4-unix.tar.gz
+ARG NEO4J_URI=https://dist.neo4j.org/neo4j-enterprise-4.4.5-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_latest/Dockerfile b/neo4j_latest/Dockerfile
index 64bbfa3..b547d11 100644
--- a/neo4j_latest/Dockerfile
+++ b/neo4j_latest/Dockerfile
@@ -1,10 +1,10 @@
FROM openjdk:11-jdk-slim
-ENV NEO4J_SHA256=46ea100f162c86284c352fa56606565d6d87ffe5fc9369945914d08728eff2be \
- NEO4J_TARBALL=neo4j-community-4.4.4-unix.tar.gz \
+ENV NEO4J_SHA256=26a3fa9f3c567a9edd337e2a33c82cc25e9ee65ca83e69ba52af628b96abb745 \
+ NEO4J_TARBALL=neo4j-community-4.4.5-unix.tar.gz \
NEO4J_EDITION=community \
NEO4J_HOME="/var/lib/neo4j"
-ARG NEO4J_URI=https://dist.neo4j.org/neo4j-community-4.4.4-unix.tar.gz
+ARG NEO4J_URI=https://dist.neo4j.org/neo4j-community-4.4.5-unix.tar.gz
RUN addgroup --gid 7474 --system neo4j && adduser --uid 7474 --system --no-create-home --home "${NEO4J_HOME}" --ingroup neo4j neo4j Relevant Maintainers:
|
Looks OK! The only concern that I'd like to verify (for your sake!) is that |
Oh that's very strange. That function has been in the entrypoint for nearly a year now, I wonder why it's suddenly showing up in the diff? I will investigate. |
OK I understand, that function is in the 4.3.0 and upwards Neo4j images, and the diff was between 4.2 and 4.3 ones, so it was flagged. Since that function's been in production for a while I'll not fix it right now, but I think you may have a point about the quoting. It's supposed to return some big long java command, but who's to say there won't be feature creep in the future that introduces I'm glad there's someone checking my work! |
Ahhh, sorry for the false alarm, but glad it gave you something to think about. 😄 I'll go ahead and merge then. 👍 |
Thank you!