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

Publish 3.0.1 #1757

Merged
merged 1 commit into from
May 19, 2016
Merged

Publish 3.0.1 #1757

merged 1 commit into from
May 19, 2016

Conversation

srbaker
Copy link
Contributor

@srbaker srbaker commented May 19, 2016

No description provided.

@tianon
Copy link
Member

tianon commented May 19, 2016

LGTM

diff --git a/3.0.0-enterprise/Dockerfile b/3.0.1-enterprise/Dockerfile
similarity index 86%
copy from 3.0.0-enterprise/Dockerfile
copy to 3.0.1-enterprise/Dockerfile
index e2e3dec..315f4a1 100644
--- a/3.0.0-enterprise/Dockerfile
+++ b/3.0.1-enterprise/Dockerfile
@@ -1,8 +1,8 @@
 FROM java:openjdk-8-jre

-ENV NEO4J_VERSION 3.0.0
+ENV NEO4J_VERSION 3.0.1
 ENV NEO4J_EDITION enterprise
-ENV NEO4J_DOWNLOAD_SHA256 376409e1849f2f13d5ea6ddc672b535646ffb9a24527520b661e044190bf617a
+ENV NEO4J_DOWNLOAD_SHA256 d88c107d10bc4d4919bbac775aa128b4c312a420abfd06897471b5fa96864b11
 ENV NEO4J_DOWNLOAD_ROOT http://dist.neo4j.org
 ENV NEO4J_TARBALL neo4j-$NEO4J_EDITION-$NEO4J_VERSION-unix.tar.gz
 ENV NEO4J_URI $NEO4J_DOWNLOAD_ROOT/$NEO4J_TARBALL
diff --git a/docker-entrypoint.sh b/3.0.1-enterprise/docker-entrypoint.sh
similarity index 100%
copy from docker-entrypoint.sh
copy to 3.0.1-enterprise/docker-entrypoint.sh
diff --git a/3.0.0/Dockerfile b/3.0.1/Dockerfile
similarity index 86%
copy from 3.0.0/Dockerfile
copy to 3.0.1/Dockerfile
index 576a7fb..4719365 100644
--- a/3.0.0/Dockerfile
+++ b/3.0.1/Dockerfile
@@ -1,8 +1,8 @@
 FROM java:openjdk-8-jre

-ENV NEO4J_VERSION 3.0.0
+ENV NEO4J_VERSION 3.0.1
 ENV NEO4J_EDITION community
-ENV NEO4J_DOWNLOAD_SHA256 1f1aeb3c748d5b05c263b7dab8b195df788507f59228e80534ed8e506a80c517
+ENV NEO4J_DOWNLOAD_SHA256 ae9d966559c83a9f1c61e1ef4d67aafeb9185e568b6dec0cd6b50e4297a15895
 ENV NEO4J_DOWNLOAD_ROOT http://dist.neo4j.org
 ENV NEO4J_TARBALL neo4j-$NEO4J_EDITION-$NEO4J_VERSION-unix.tar.gz
 ENV NEO4J_URI $NEO4J_DOWNLOAD_ROOT/$NEO4J_TARBALL
diff --git a/docker-entrypoint.sh b/3.0.1/docker-entrypoint.sh
similarity index 100%
copy from docker-entrypoint.sh
copy to 3.0.1/docker-entrypoint.sh
diff --git a/Makefile b/Makefile
index 6d8481a..2e2132c 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ endif
 all: dev/runs-okay
 .PHONY: all

-include 3.0.0.mk 3.0.0-enterprise.mk
+include 3.0.0.mk 3.0.0-enterprise.mk 3.0.1.mk 3.0.1-enterprise.mk

 %.mk: version.mk.template Makefile
 > sed "s/%%VERSION%%/$*/g" $< >$@
diff --git a/README.md b/README.md
index bf3c785..446531f 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ You can start a Neo4j 2.3 container like this:
 docker run \
     --publish=7474:7474 \
     --volume=$HOME/neo4j/data:/data \
-    neo4j
+    neo4j:2.3

Neo4j 3.0

@@ -26,7 +26,7 @@ You can start a Neo4j 3.0 container like this:
docker run
--publish=7474:7474 --publish=7687:7687
--volume=$HOME/neo4j/data:/data \

  • neo4j/neo4j:milestone
  • neo4j:3.0

# Getting support and contributing
diff --git a/lookup b/lookup
index e9e0cad..42d9190 100755
--- a/lookup
+++ b/lookup
@@ -4,6 +4,14 @@ import os
import sys

data = {
+    '3.0.1': {
+        'community': {
+            'sha': 'ae9d966559c83a9f1c61e1ef4d67aafeb9185e568b6dec0cd6b50e4297a15895'
+        },
+        'enterprise': {
+            'sha': 'd88c107d10bc4d4919bbac775aa128b4c312a420abfd06897471b5fa96864b11'
+        }
+    },
 '3.0.0': {
     'community': {
         'sha': '1f1aeb3c748d5b05c263b7dab8b195df788507f59228e80534ed8e506a80c517'

@tianon
Copy link
Member

tianon commented May 19, 2016

Build test of #1757; 248196f (neo4j):

$ bashbrew build "neo4j"
Cloning neo4j (git://github.com/neo4j/docker-neo4j) ...
Processing neo4j:2.3.3 ...
Processing neo4j:2.3 ...
Processing neo4j:2.3.3-enterprise ...
Processing neo4j:2.3-enterprise ...
Processing neo4j:3.0.1 ...
Processing neo4j:3.0 ...
Processing neo4j:latest ...
Processing neo4j:3.0.1-enterprise ...
Processing neo4j:3.0-enterprise ...
Processing neo4j:enterprise ...
$ bashbrew list --uniq "$url" | xargs test/run.sh
testing neo4j:2.3.3
    'utc' [1/4]...passed
    'cve-2014--shellshock' [2/4]...passed
    'no-hard-coded-passwords' [3/4]...passed
    'override-cmd' [4/4]...passed
testing neo4j:2.3.3-enterprise
    'utc' [1/4]...passed
    'cve-2014--shellshock' [2/4]...passed
    'no-hard-coded-passwords' [3/4]...passed
    'override-cmd' [4/4]...passed
testing neo4j:3.0.1
    'utc' [1/4]...passed
    'cve-2014--shellshock' [2/4]...passed
    'no-hard-coded-passwords' [3/4]...passed
    'override-cmd' [4/4]...passed
testing neo4j:3.0.1-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 ac6f79c into docker-library:master May 19, 2016
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