Skip to content

Conversation

bfeshti
Copy link
Contributor

@bfeshti bfeshti commented Oct 18, 2019

No description provided.

@tianon
Copy link
Member

tianon commented Oct 18, 2019

Diff:
diff --git a/_bashbrew-arches b/_bashbrew-arches
index d2e9378..592b527 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -8,5 +8,7 @@ neo4j:3.5.7 @ amd64
 neo4j:3.5.7-enterprise @ amd64
 neo4j:3.5.8 @ amd64
 neo4j:3.5.8-enterprise @ amd64
+neo4j:3.5.11 @ amd64
+neo4j:3.5.11-enterprise @ amd64
 neo4j:enterprise @ amd64
 neo4j:latest @ amd64
diff --git a/_bashbrew-list b/_bashbrew-list
index f405769..f93c7f3 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -14,5 +14,7 @@ neo4j:3.5.8
 neo4j:3.5.8-enterprise
 neo4j:3.5.11
 neo4j:3.5.11-enterprise
+neo4j:3.5.12
+neo4j:3.5.12-enterprise
 neo4j:enterprise
 neo4j:latest
diff --git a/neo4j_enterprise/Dockerfile b/neo4j_3.5.11-enterprise/Dockerfile
similarity index 100%
copy from neo4j_enterprise/Dockerfile
copy to neo4j_3.5.11-enterprise/Dockerfile
diff --git a/neo4j_enterprise/docker-entrypoint.sh b/neo4j_3.5.11-enterprise/docker-entrypoint.sh
similarity index 100%
copy from neo4j_enterprise/docker-entrypoint.sh
copy to neo4j_3.5.11-enterprise/docker-entrypoint.sh
diff --git a/neo4j_3.4-enterprise/local-package/.sentinel b/neo4j_3.5.11-enterprise/local-package/.sentinel
similarity index 100%
copy from neo4j_3.4-enterprise/local-package/.sentinel
copy to neo4j_3.5.11-enterprise/local-package/.sentinel
diff --git a/neo4j_enterprise/local-package/neo4jlabs-plugins.json b/neo4j_3.5.11-enterprise/local-package/neo4jlabs-plugins.json
similarity index 100%
copy from neo4j_enterprise/local-package/neo4jlabs-plugins.json
copy to neo4j_3.5.11-enterprise/local-package/neo4jlabs-plugins.json
diff --git a/neo4j_latest/Dockerfile b/neo4j_3.5.11/Dockerfile
similarity index 100%
copy from neo4j_latest/Dockerfile
copy to neo4j_3.5.11/Dockerfile
diff --git a/neo4j_enterprise/docker-entrypoint.sh b/neo4j_3.5.11/docker-entrypoint.sh
similarity index 100%
copy from neo4j_enterprise/docker-entrypoint.sh
copy to neo4j_3.5.11/docker-entrypoint.sh
diff --git a/neo4j_3.4-enterprise/local-package/.sentinel b/neo4j_3.5.11/local-package/.sentinel
similarity index 100%
copy from neo4j_3.4-enterprise/local-package/.sentinel
copy to neo4j_3.5.11/local-package/.sentinel
diff --git a/neo4j_enterprise/local-package/neo4jlabs-plugins.json b/neo4j_3.5.11/local-package/neo4jlabs-plugins.json
similarity index 100%
copy from neo4j_enterprise/local-package/neo4jlabs-plugins.json
copy to neo4j_3.5.11/local-package/neo4jlabs-plugins.json
diff --git a/neo4j_enterprise/Dockerfile b/neo4j_enterprise/Dockerfile
index 9762271..c60cb25 100644
--- a/neo4j_enterprise/Dockerfile
+++ b/neo4j_enterprise/Dockerfile
@@ -1,12 +1,12 @@
 FROM openjdk:8-jre-slim
 
-ENV NEO4J_SHA256=e706a6a008bebc5fa06d97f671dc6099d1d1871020373c053a28f695964f88b2 \
-    NEO4J_TARBALL=neo4j-enterprise-3.5.11-unix.tar.gz \
+ENV NEO4J_SHA256=bf23ff236aa5e4b15a840441d7e75d14ff3eb04de8e67edd291c23762be790cd \
+    NEO4J_TARBALL=neo4j-enterprise-3.5.12-unix.tar.gz \
     NEO4J_EDITION=enterprise \
     NEO4J_HOME="/var/lib/neo4j" \
     TINI_VERSION="v0.18.0" \
     TINI_SHA256="12d20136605531b09a2c2dac02ccee85e1b874eb322ef6baf7561cd93f93c855"
-ARG NEO4J_URI=https://dist.neo4j.org/neo4j-enterprise-3.5.11-unix.tar.gz
+ARG NEO4J_URI=https://dist.neo4j.org/neo4j-enterprise-3.5.12-unix.tar.gz
 
 RUN addgroup --system neo4j && adduser --system --no-create-home --home "${NEO4J_HOME}" --ingroup neo4j neo4j
 
diff --git a/neo4j_enterprise/local-package/neo4jlabs-plugins.json b/neo4j_enterprise/local-package/neo4jlabs-plugins.json
index f4de86d..fa77de2 100644
--- a/neo4j_enterprise/local-package/neo4jlabs-plugins.json
+++ b/neo4j_enterprise/local-package/neo4jlabs-plugins.json
@@ -1,7 +1,7 @@
 {
-  "apoc": "https://github.com/neo4j-contrib/neo4j-apoc-procedures/raw/master/versions.json",
-  "streams": "https://github.com/neo4j-contrib/neo4j-streams/raw/master/versions.json",
-  "graphql": "https://github.com/neo4j-contrib/neo4j-graphql/raw/master/versions.json",
-  "graph-algorithms": "https://github.com/neo4j-contrib/neo4j-graph-algorithms/raw/master/versions.json",
+  "apoc": "https://neo4j-contrib.github.io/neo4j-apoc-procedures/versions.json",
+  "streams": "https://neo4j-contrib.github.io/neo4j-streams/versions.json",
+  "graphql": "https://neo4j-graphql.github.io/neo4j-graphql/versions.json",
+  "graph-algorithms": "https://neo4j-contrib.github.io/neo4j-graph-algorithms/versions.json",
   "_testing": "http://host.testcontainers.internal:3000/versions.json"
 }
diff --git a/neo4j_latest/Dockerfile b/neo4j_latest/Dockerfile
index 3e143b5..642fc04 100644
--- a/neo4j_latest/Dockerfile
+++ b/neo4j_latest/Dockerfile
@@ -1,12 +1,12 @@
 FROM openjdk:8-jre-slim
 
-ENV NEO4J_SHA256=4dd4f2b6c32e216b42ab8d2235f10c4d992d567d36927df93d2d9fb1763e6376 \
-    NEO4J_TARBALL=neo4j-community-3.5.11-unix.tar.gz \
+ENV NEO4J_SHA256=3b82b72a211d1b628b64f18f4af9f10b12ed6e2fd0ad94910e11b7fef5d0d86c \
+    NEO4J_TARBALL=neo4j-community-3.5.12-unix.tar.gz \
     NEO4J_EDITION=community \
     NEO4J_HOME="/var/lib/neo4j" \
     TINI_VERSION="v0.18.0" \
     TINI_SHA256="12d20136605531b09a2c2dac02ccee85e1b874eb322ef6baf7561cd93f93c855"
-ARG NEO4J_URI=https://dist.neo4j.org/neo4j-community-3.5.11-unix.tar.gz
+ARG NEO4J_URI=https://dist.neo4j.org/neo4j-community-3.5.12-unix.tar.gz
 
 RUN addgroup --system neo4j && adduser --system --no-create-home --home "${NEO4J_HOME}" --ingroup neo4j neo4j
 
diff --git a/neo4j_latest/local-package/neo4jlabs-plugins.json b/neo4j_latest/local-package/neo4jlabs-plugins.json
index f4de86d..fa77de2 100644
--- a/neo4j_latest/local-package/neo4jlabs-plugins.json
+++ b/neo4j_latest/local-package/neo4jlabs-plugins.json
@@ -1,7 +1,7 @@
 {
-  "apoc": "https://github.com/neo4j-contrib/neo4j-apoc-procedures/raw/master/versions.json",
-  "streams": "https://github.com/neo4j-contrib/neo4j-streams/raw/master/versions.json",
-  "graphql": "https://github.com/neo4j-contrib/neo4j-graphql/raw/master/versions.json",
-  "graph-algorithms": "https://github.com/neo4j-contrib/neo4j-graph-algorithms/raw/master/versions.json",
+  "apoc": "https://neo4j-contrib.github.io/neo4j-apoc-procedures/versions.json",
+  "streams": "https://neo4j-contrib.github.io/neo4j-streams/versions.json",
+  "graphql": "https://neo4j-graphql.github.io/neo4j-graphql/versions.json",
+  "graph-algorithms": "https://neo4j-contrib.github.io/neo4j-graph-algorithms/versions.json",
   "_testing": "http://host.testcontainers.internal:3000/versions.json"
 }

@tianon
Copy link
Member

tianon commented Oct 18, 2019

FYI image maintainers @benbc @digitalstain @jennyowen

LGTM

Build test of #6807; de60dd8; amd64 (neo4j):

$ bashbrew build neo4j:3.5.12
Building bashbrew/cache:41f8377ef330bbf951ea376db6592c9647126e1d70d7ce15fa614500fabaed22 (neo4j:3.5.12)
Tagging neo4j:3.5.12
Tagging neo4j:3.5
Tagging neo4j:latest

$ test/run.sh neo4j:3.5.12
testing neo4j:3.5.12
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build neo4j:3.5.12-enterprise
Building bashbrew/cache:6d12ccca425a58fbbf3fbbe483ed636c21674461baed34413065bca384525988 (neo4j:3.5.12-enterprise)
Tagging neo4j:3.5.12-enterprise
Tagging neo4j:3.5-enterprise
Tagging neo4j:enterprise

$ test/run.sh neo4j:3.5.12-enterprise
testing neo4j:3.5.12-enterprise
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build neo4j:3.5.11
Using bashbrew/cache:d792a0f0fa9199307e815921175d6313115cd6b1aa3cbb4dadbb7b482296bb07 (neo4j:3.5.11)
Tagging neo4j:3.5.11

$ test/run.sh neo4j:3.5.11
testing neo4j:3.5.11
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build neo4j:3.5.11-enterprise
Using bashbrew/cache:d0a1b1c7b4d98a3ed8fe373971d03bced1fd87fd466962aa86780afb6d26e5e6 (neo4j:3.5.11-enterprise)
Tagging neo4j:3.5.11-enterprise

$ test/run.sh neo4j:3.5.11-enterprise
testing neo4j:3.5.11-enterprise
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build neo4j:3.5.8
Using bashbrew/cache:070d72a2391c5a3b2e3b4077db6c29b3e987eff1818e153930b3dd737f7bb0f0 (neo4j:3.5.8)
Tagging neo4j:3.5.8

$ test/run.sh neo4j:3.5.8
testing neo4j:3.5.8
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build neo4j:3.5.8-enterprise
Using bashbrew/cache:6c2657351031b1b475b425eb44c90a260fd6a07478fd83294beb90032239660f (neo4j:3.5.8-enterprise)
Tagging neo4j:3.5.8-enterprise

$ test/run.sh neo4j:3.5.8-enterprise
testing neo4j:3.5.8-enterprise
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build neo4j:3.5.7
Using bashbrew/cache:659022f944466976493ca9751a7936fa4f1f57fa4fa00f98de4262daf0c98223 (neo4j:3.5.7)
Tagging neo4j:3.5.7

$ test/run.sh neo4j:3.5.7
testing neo4j:3.5.7
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build neo4j:3.5.7-enterprise
Using bashbrew/cache:cf8b4f45926ebd7f9def55bd0a0f0106532566f88a3f0ac23b15aa5bec943cb8 (neo4j:3.5.7-enterprise)
Tagging neo4j:3.5.7-enterprise

$ test/run.sh neo4j:3.5.7-enterprise
testing neo4j:3.5.7-enterprise
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build neo4j:3.5.6
Using bashbrew/cache:48ab3a8b6bb210a1e00188bb73efeb36670185ba70e3d62ae320d6b350161142 (neo4j:3.5.6)
Tagging neo4j:3.5.6

$ test/run.sh neo4j:3.5.6
testing neo4j:3.5.6
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build neo4j:3.5.6-enterprise
Using bashbrew/cache:75d203fe5286463af76325c42aebe44bf5a3c854484851ae563aa23b4ced8596 (neo4j:3.5.6-enterprise)
Tagging neo4j:3.5.6-enterprise

$ test/run.sh neo4j:3.5.6-enterprise
testing neo4j:3.5.6-enterprise
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build neo4j:3.4.15
Using bashbrew/cache:72dc3a27e179affa4e8853ea58ca0f4388eb806fcf3b66dfbd5458379a099283 (neo4j:3.4.15)
Tagging neo4j:3.4.15
Tagging neo4j:3.4

$ test/run.sh neo4j:3.4.15
testing neo4j:3.4.15
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build neo4j:3.4.15-enterprise
Using bashbrew/cache:407498ebf5acae68cc3c54b6f1dc53d9e388e39921220f47aa627edd99a72453 (neo4j:3.4.15-enterprise)
Tagging neo4j:3.4.15-enterprise
Tagging neo4j:3.4-enterprise

$ test/run.sh neo4j:3.4.15-enterprise
testing neo4j:3.4.15-enterprise
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build neo4j:3.4.14
Using bashbrew/cache:f9ca3f6ed8d6ab3a790a0bad427efbe45504b7f5106f4477634d7e5eeffa0834 (neo4j:3.4.14)
Tagging neo4j:3.4.14

$ test/run.sh neo4j:3.4.14
testing neo4j:3.4.14
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build neo4j:3.4.14-enterprise
Using bashbrew/cache:5facc109b820a34d7aead1f8228c9bd50cb6ec5d43f57fa09d69e383105e27be (neo4j:3.4.14-enterprise)
Tagging neo4j:3.4.14-enterprise

$ test/run.sh neo4j:3.4.14-enterprise
testing neo4j:3.4.14-enterprise
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed

@tianon tianon merged commit c183ce3 into docker-library:master Oct 18, 2019
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