[tinkerpop] 01/03: Fixed doc generation in docker.

[sp...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 7312e989e58bf2e5ce66711d5fd069b4c39d6efa
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Wed Apr 15 14:14:21 2020 -0400

    Fixed doc generation in docker.
    
    Grape failing in that environment for some reason, but the addition of the dual setting seemed to let the combined resolvers work. Fixed some issues with the docker image itself which seemed to be missing some commands that the doc gen has always relied on. Hard to believe that has been a problem since going to xenial but perhaps it is so. CTR
---
 docker/Dockerfile                       |  2 +-
 docker/build.sh                         |  2 +-
 docker/resources/groovy/grapeConfig.xml | 19 ++++++-------------
 docker/scripts/build.sh                 |  1 +
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3fd2c39..d997be6 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -20,7 +20,7 @@ FROM ubuntu:xenial
 LABEL maintainer="Daniel Kuppitz <me...@gremlin.guru>"
 
 RUN apt-get update
-RUN apt-get -y install software-properties-common python-software-properties apt-transport-https curl dpkg
+RUN apt-get -y install software-properties-common python-software-properties apt-transport-https curl dpkg netcat net-tools
 RUN add-apt-repository ppa:openjdk-r/ppa
 RUN sh -c 'curl -s https://packages.microsoft.com/config/ubuntu/16.04/packages-microsoft-prod.deb -o packages-microsoft-prod.deb'
 RUN sh -c 'dpkg -i packages-microsoft-prod.deb'
diff --git a/docker/build.sh b/docker/build.sh
index 7eb46b4..2ed3232 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -50,7 +50,7 @@ CMD ["sh", "-c", "docker/scripts/build.sh $@"]
 EOF
 
 docker build -t tinkerpop:${BUILD_TAG} .
-docker run ${TINKERPOP_DOCKER_OPTS} ${REMOVE_CONTAINER} -ti tinkerpop:${BUILD_TAG}
+docker run ${TINKERPOP_DOCKER_OPTS} ${REMOVE_CONTAINER} -e "JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64" -ti tinkerpop:${BUILD_TAG}
 
 status=$?
 popd > /dev/null
diff --git a/docker/resources/groovy/grapeConfig.xml b/docker/resources/groovy/grapeConfig.xml
index 148c55d..98b3b38 100644
--- a/docker/resources/groovy/grapeConfig.xml
+++ b/docker/resources/groovy/grapeConfig.xml
@@ -1,22 +1,15 @@
 <ivysettings>
   <settings defaultResolver="downloadGrapes"/>
-  <property name="m2-pattern" value="${user.home}/.m2/repository/org/apache/tinkerpop/[module]/[revision]/[module]-[revision](-[classifier]).[ext]" />
-  <property name="m2-pattern-ivy" value="${user.home}/.m2/repository/org/apache/tinkerpop/[module]/[revision]/[module]-[revision](-[classifier]).pom" />
-  <caches>
-    <cache name="nocache" useOrigin="true" />
-  </caches>
   <resolvers>
-    <chain name="downloadGrapes">
-      <filesystem name="local-maven2" checkmodified="true" changingPattern=".*" changingMatcher="regexp" m2compatible="true" cache="nocache">
-        <artifact pattern="${m2-pattern}"/>
-        <ivy pattern="${m2-pattern-ivy}"/>
-      </filesystem>
+    <chain name="downloadGrapes" dual="true">
       <filesystem name="cachedGrapes">
         <ivy pattern="${user.home}/.groovy/grapes/[organisation]/[module]/ivy-[revision].xml"/>
-        <artifact pattern="${user.home}/.groovy/grapes/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
+        <artifact pattern="${user.home}/.groovy/grapes/[organisation]/[module]/[type]s/[artifact]-[revision](-[classifier]).[ext]"/>
       </filesystem>
+      <ibiblio name="localm2" root="file:${user.home}/.m2/repository/" checkmodified="true" changingPattern=".*" changingMatcher="regexp" m2compatible="true"/>
+      <!-- todo add 'endorsed groovy extensions' resolver here -->
+      <ibiblio name="jcenter" root="https://jcenter.bintray.com/" m2compatible="true"/>
       <ibiblio name="ibiblio" m2compatible="true"/>
-      <ibiblio name="local" root="file:${user.home}/.m2/repository/" m2compatible="true"/>
     </chain>
   </resolvers>
-</ivysettings>
+</ivysettings>
\ No newline at end of file
diff --git a/docker/scripts/build.sh b/docker/scripts/build.sh
index 643e8bc..bf0df0d 100755
--- a/docker/scripts/build.sh
+++ b/docker/scripts/build.sh
@@ -89,6 +89,7 @@ if [ ! -z "${BUILD_USER_DOCS}" ]; then
   service ssh start
 
   # start Hadoop
+  echo "export JAVA_HOME=$JAVA_HOME" >> ${HADOOP_PREFIX}/etc/hadoop/hadoop-env.sh
   cp docker/hadoop/resources/* ${HADOOP_PREFIX}/etc/hadoop/
   hdfs namenode -format
   ${HADOOP_PREFIX}/sbin/start-dfs.sh