Use default JanusGraph Server config file

This ensures that we are using the default settings from the
distribution and only apply custom settings specifically for the Docker
image on top of that.
Right now, this will change the graph manager to `JanusGraphManager`
which helps with JanusGraph/janusgraph#2822 and
JanusGraph/janusgraph#3644.

Fixes #113

Signed-off-by: Florian Hockmann <[email protected]>

Author: FlorianHockmann

0.6/Dockerfile

@@ -41,6 +41,7 @@ RUN apt update -y && apt install -y gpg unzip curl && \
     rm -rf ${JANUS_HOME}/log && \
     rm -rf ${JANUS_HOME}/examples && \
     rm -rf ${JANUS_HOME}/conf/janusgraph-*.properties && \
+    mv ${JANUS_HOME}/conf/gremlin-server/gremlin-server.yaml ${JANUS_HOME}/conf/janusgraph-server.yaml && \
     rm -rf ${JANUS_HOME}/conf/gremlin-server
 
 COPY conf/ ${JANUS_HOME}/conf/

0.6/conf/janusgraph-server.yaml

@@ -41,6 +41,7 @@ RUN apt update -y && apt install -y gpg unzip curl && \
     rm -rf ${JANUS_HOME}/log && \
     rm -rf ${JANUS_HOME}/examples && \
     rm -rf ${JANUS_HOME}/conf/janusgraph-*.properties && \
+    mv ${JANUS_HOME}/conf/gremlin-server/gremlin-server.yaml ${JANUS_HOME}/conf/janusgraph-server.yaml && \
     rm -rf ${JANUS_HOME}/conf/gremlin-server
 
 COPY conf/ ${JANUS_HOME}/conf/

1.0/Dockerfile

@@ -37,6 +37,7 @@ RUN apt update -y && apt install -y gpg unzip curl && \
     rm -rf ${JANUS_HOME}/log && \
     rm -rf ${JANUS_HOME}/examples && \
     rm -rf ${JANUS_HOME}/conf/janusgraph-*.properties && \
+    mv ${JANUS_HOME}/conf/gremlin-server/gremlin-server.yaml ${JANUS_HOME}/conf/janusgraph-server.yaml && \
     rm -rf ${JANUS_HOME}/conf/gremlin-server
 
 COPY conf/ ${JANUS_HOME}/conf/

1.0/conf/janusgraph-server.yaml

@@ -37,6 +37,7 @@ RUN apt update -y && apt install -y gpg unzip curl && \
     rm -rf ${JANUS_HOME}/log && \
     rm -rf ${JANUS_HOME}/examples && \
     rm -rf ${JANUS_HOME}/conf/janusgraph-*.properties && \
+    mv ${JANUS_HOME}/conf/gremlin-server/gremlin-server.yaml ${JANUS_HOME}/conf/janusgraph-server.yaml && \
     rm -rf ${JANUS_HOME}/conf/gremlin-server
 
 COPY conf/ ${JANUS_HOME}/conf/

build/Dockerfile-openjdk11.template

@@ -91,7 +91,6 @@ for version in "${versions[@]}"; do
   awk 'NR>1' build/load-initdb.sh >> $dir/load-initdb.sh
 
   # copy resources
-  copy-with-template-generated-warning conf/janusgraph-server.yaml "#"
   copy-with-template-generated-warning conf/janusgraph-berkeleyje-es-server.properties "#"
   copy-with-template-generated-warning conf/janusgraph-berkeleyje-lucene-server.properties "#"
   copy-with-template-generated-warning conf/janusgraph-berkeleyje-server.properties "#"