Fix the way plugins are added

ConvivioTeam · Oct 23, 2019 · 7a85a92 · 7a85a92
1 parent 0e0d951
commit 7a85a92
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/image-src/3.4/Dockerfile b/image-src/3.4/Dockerfile
@@ -4,15 +4,15 @@ ENV NEO4J_AUTH=neo4j/letmein
 
 ENV APOC_VERSION 3.4.0.7
 ENV APOC_URI https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/download/${APOC_VERSION}/apoc-${APOC_VERSION}-all.jar
-ADD ${APOC_URI} /var/lib/neo4j/plugins
+RUN curl --silent --show-error --fail --retry 30 --retry-max-time 300 -L -o ${PLUGINS_DIR}/apoc.jar ${APOC_URI}
 
 ENV GRAPHQL_VERSION 3.4.0.3
 ENV GRAPHQL_URI https://github.com/neo4j-graphql/neo4j-graphql/releases/download/${GRAPHQL_VERSION}/neo4j-graphql-${GRAPHQL_VERSION}.jar
-ADD ${GRAPHQL_URI} /var/lib/neo4j/plugins
+RUN  curl --silent --show-error --fail --retry 30 --retry-max-time 300 -L -o ${PLUGINS_DIR}/graph-ql.jar ${GRAPHQL_URI}
 
 ENV GRAPH_ALGORITHMS_VERSION 3.4.12.7
 ENV GRAPH_ALGORITHMS_URI https://github.com/neo4j-contrib/neo4j-graph-algorithms/releases/download/${GRAPH_ALGORITHMS_VERSION}/graph-algorithms-algo-${GRAPH_ALGORITHMS_VERSION}.jar
-ADD ${GRAPH_ALGORITHMS_URI} /var/lib/neo4j/plugins
+RUN  curl --silent --show-error --fail --retry 30 --retry-max-time 300 -L -o ${PLUGINS_DIR}/graph-algorithms.jar ${GRAPH_ALGORITHMS_URI}
 
 EXPOSE 7474 7473 7687
 

diff --git a/image-src/3.5/Dockerfile b/image-src/3.5/Dockerfile
@@ -1,18 +1,19 @@
 FROM neo4j:3.5.11
 
 ENV NEO4J_AUTH=neo4j/letmein
+ENV PLUGINS_DIR=/var/lib/neo4j/plugins
 
 ENV APOC_VERSION 3.5.0.5
 ENV APOC_URI https://github.com/neo4j-contrib/neo4j-apoc-procedures/releases/download/${APOC_VERSION}/apoc-${APOC_VERSION}-all.jar
-ADD ${APOC_URI} /var/lib/neo4j/plugins
+RUN curl --silent --show-error --fail --retry 30 --retry-max-time 300 -L -o ${PLUGINS_DIR}/apoc.jar ${APOC_URI}
 
 ENV GRAPHQL_VERSION 3.5.0.4
 ENV GRAPHQL_URI https://github.com/neo4j-graphql/neo4j-graphql/releases/download/${GRAPHQL_VERSION}/neo4j-graphql-${GRAPHQL_VERSION}.jar
-ADD ${GRAPHQL_URI} /var/lib/neo4j/plugins
+RUN  curl --silent --show-error --fail --retry 30 --retry-max-time 300 -L -o ${PLUGINS_DIR}/graph-ql.jar ${GRAPHQL_URI}
 
 ENV GRAPH_ALGORITHMS_VERSION 3.5.4.0
 ENV GRAPH_ALGORITHMS_URI https://github.com/neo4j-contrib/neo4j-graph-algorithms/releases/download/${GRAPH_ALGORITHMS_VERSION}/graph-algorithms-algo-${GRAPH_ALGORITHMS_VERSION}.jar
-ADD ${GRAPH_ALGORITHMS_URI} /var/lib/neo4j/plugins
+RUN  curl --silent --show-error --fail --retry 30 --retry-max-time 300 -L -o ${PLUGINS_DIR}/graph-algorithms.jar ${GRAPH_ALGORITHMS_URI}
 
 EXPOSE 7474 7473 7687