Use Docker Compose to manage JanusGraph Gremlin Server and Elasticsearch containers

Signed-off-by: sjudeng <[email protected]>

Author: sjudeng

BUILDING.md

@@ -30,16 +30,18 @@ To build with only the TinkerPop tests\*:
 mvn clean install -Dtest.skip.tp=false -DskipTests=true
 ```
 
-To build and run a docker image with JanusGraph and Gremlin Server, configured
-to run the berkeleyje backend with an embedded ElasticSearch instance:
+## Building Docker Image for JanusGraph Gremlin Server
+
+To build and run Docker images with JanusGraph and Gremlin Server, configured 
+to run the BerkeleyJE backend and Elasticsearch (requires [Docker Compose](https://docs.docker.com/compose/)):
 
 ```bash
-mvn clean package -Pjanusgraph-release -Dgpg.skip=true -DskipTests=true
-cd janusgraph-hbase-parent/janusgraph-hbase-core && mvn install -DskipTests=true && cd ../..
-cd janusgraph-dist && mvn install -Pjanusgraph-docker -DskipTests=true docker:build
-docker run -d -p 8182:8182 --name janusgraph janusgraph/server:latest
+mvn clean install -Pjanusgraph-release -Dgpg.skip=true -DskipTests=true && mvn docker:build -Pjanusgraph-docker -pl janusgraph-dist
+docker-compose -f janusgraph-dist/janusgraph-dist-hadoop-2/docker-compose.yml up
 ```
 
+Note the above `docker-compose` call launches containers in the foreground and is convenient for monitoring logs but add "-d" to instead run in the background.
+
 To connect to the server in the same container on the console:
 
 ```bash

janusgraph-dist/janusgraph-dist-hadoop-2/Dockerfile

@@ -1,13 +1,11 @@
 FROM openjdk:8
 
-ENV PATH "$JAVA_HOME/bin:$PATH"
-RUN apt-get update -y && apt-get install -y zip
-WORKDIR /var
-
 ARG server_zip
-ARG server_base
 ADD ${server_zip} /var
-RUN unzip -q ${server_base}.zip && ln -s ./${server_base} ./janusgraph
+
+RUN apt-get update -y && apt-get install -y zip && \
+    server_base=`basename ${server_zip} .zip` && \
+    unzip -q /var/${server_base}.zip -d /var && \
+    ln -s /var/${server_base} /var/janusgraph
+
 WORKDIR /var/janusgraph
-EXPOSE 8182
-CMD ["./bin/gremlin-server.sh", "./conf/gremlin-server/gremlin-server-berkeleyje.yaml"]

janusgraph-dist/janusgraph-dist-hadoop-2/docker-compose.yml

@@ -0,0 +1,24 @@
+version: '2'
+services:
+  janusgraph:
+    image: janusgraph/server:latest
+    container_name: janusgraph
+    ports:
+      - "8182:8182"
+    volumes:
+      - ./es/wait-for-es.sh:/usr/bin/wait-for-es.sh
+    depends_on:
+      - "elasticsearch"
+    command: ["wait-for-es.sh", "elasticsearch", "./bin/gremlin-server.sh", "./conf/gremlin-server/gremlin-server-berkeleyje.yaml"]
+
+  elasticsearch:
+    image: docker.elastic.co/elasticsearch/elasticsearch:5.3.2
+    environment:
+      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+      - "http.host=0.0.0.0"
+      - "transport.host=127.0.0.1"
+    ports:
+      - "9200"
+    volumes:
+      - ./es/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
+

janusgraph-dist/janusgraph-dist-hadoop-2/es/elasticsearch.yml

@@ -0,0 +1,10 @@
+cluster.name: "docker-cluster"
+network.host: 0.0.0.0
+
+# minimum_master_nodes need to be explicitly set when bound on a public IP
+# set to 1 to allow single node clusters
+# Details: https://github.com/elastic/elasticsearch/pull/17288
+discovery.zen.minimum_master_nodes: 1
+
+xpack.security.enabled : false
+

janusgraph-dist/janusgraph-dist-hadoop-2/es/wait-for-es.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -e
+
+host="$1"
+
+shift
+cmd="$@"
+
+until $(curl --output /dev/null --silent --head --fail http://$host:9200); do
+  printf '.'
+  sleep 5
+done
+
+>&2 echo "Elasticsearch is up"
+
+exec $cmd
+

janusgraph-dist/pom.xml

@@ -633,10 +633,9 @@
                             <artifactId>docker-maven-plugin</artifactId>
                             <version>${docker.maven.version}</version>
                             <configuration>
-                                <dockerDirectory>janusgraph-dist-hadoop-2</dockerDirectory>
+                                <dockerDirectory>${project.basedir}/janusgraph-dist-hadoop-2</dockerDirectory>
                                 <buildArgs>
                                     <server_zip>target/janusgraph-${project.version}-hadoop2.zip</server_zip>
-                                    <server_base>janusgraph-${project.version}-hadoop2</server_base>
                                 </buildArgs>
                                 <forceTags>true</forceTags>
                                 <imageName>janusgraph/server</imageName>

janusgraph-dist/src/assembly/static/conf/gremlin-server/gremlin-server-berkeleyje.yaml

@@ -36,5 +36,4 @@ maxAccumulationBufferComponents: 1024
 resultIterationBatchSize: 64
 writeBufferLowWaterMark: 32768
 writeBufferHighWaterMark: 65536
-ssl: {
-  enabled: false}
+

janusgraph-dist/src/assembly/static/conf/gremlin-server/janusgraph-berkeleyje-es-server.properties

@@ -9,6 +9,4 @@ gremlin.graph=org.janusgraph.core.JanusGraphFactory
 storage.backend=berkeleyje
 storage.directory=db/berkeley
 index.search.backend=elasticsearch
-index.search.directory=db/es
-index.search.elasticsearch.client-only=false
-index.search.elasticsearch.local-mode=true
+index.search.hostname=elasticsearch