tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dkupp...@apache.org
Subject tinkerpop git commit: * install Python and Subversion in the Docker base image * enable Python GLV for every Docker build
Date Fri, 11 Nov 2016 14:32:27 GMT
Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1363 [created] 00ed908af


* install Python and Subversion in the Docker base image
* enable Python GLV for every Docker build


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/00ed908a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/00ed908a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/00ed908a

Branch: refs/heads/TINKERPOP-1363
Commit: 00ed908af75d946bcb2493f363a0709ce3bff68f
Parents: 2d2f7ac
Author: Daniel Kuppitz <daniel_kuppitz@hotmail.com>
Authored: Tue Sep 13 02:30:34 2016 +0200
Committer: Daniel Kuppitz <daniel_kuppitz@hotmail.com>
Committed: Fri Nov 11 15:29:36 2016 +0100

----------------------------------------------------------------------
 CHANGELOG.asciidoc               | 1 +
 docker/Dockerfile                | 5 ++++-
 docker/build/Dockerfile.template | 1 -
 docker/scripts/build.sh          | 3 +++
 4 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/00ed908a/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 8211eee..fa7d01c 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+* Updated Docker build scripts to include Python dependencies (NOTE: remove any previously
generated TinkerPop Docker images).
 * Removed previously deprecated `Console` constructor that took a `String` as an argument
from `gremlin-console`.
 * Removed previously deprecated `ConcurrentBindings` from `gremlin-groovy`.
 * Removed previously deprecated `ScriptExecutor` from `gremlin-groovy`.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/00ed908a/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 87e8b07..ce3e62e 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -24,7 +24,10 @@ RUN apt-get update \
     && echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true
| debconf-set-selections \
     && add-apt-repository -y ppa:webupd8team/java \
     && apt-get update \
-    && apt-get install -y oracle-java8-installer curl gawk git maven openssh-server
\
+    && apt-get install -y oracle-java8-installer curl gawk git maven openssh-server
subversion \
+    && apt-get install -y python python-dev python-pip build-essential \
+    && pip install virtualenv virtualenvwrapper \
+    && pip install --upgrade pip \
     && rm -rf /var/lib/apt/lists/* /var/cache/oracle-jdk8-installer
 
 RUN sed -i 's@PermitRootLogin without-password@PermitRootLogin yes@' /etc/ssh/sshd_config

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/00ed908a/docker/build/Dockerfile.template
----------------------------------------------------------------------
diff --git a/docker/build/Dockerfile.template b/docker/build/Dockerfile.template
index 8364884..84f551d 100644
--- a/docker/build/Dockerfile.template
+++ b/docker/build/Dockerfile.template
@@ -18,6 +18,5 @@
 FROM tinkerpop:hadoop-HADOOP_VERSION
 
 RUN mkdir -p /usr/src/tinkerpop
-RUN curl -s https://bootstrap.pypa.io/ez_setup.py | python
 WORKDIR /usr/src/tinkerpop
 COPY . /usr/src/tinkerpop

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/00ed908a/docker/scripts/build.sh
----------------------------------------------------------------------
diff --git a/docker/scripts/build.sh b/docker/scripts/build.sh
index 2ee4dff..2e76aff 100755
--- a/docker/scripts/build.sh
+++ b/docker/scripts/build.sh
@@ -51,11 +51,14 @@ done
 
 TINKERPOP_BUILD_OPTIONS=""
 
+[ -z "${BUILD_USER_DOCS}" ] || [ -z "${RUN_TESTS}" ] || TINKERPOP_BUILD_OPTIONS="${TINKERPOP_BUILD_OPTIONS}
-DglvPython"
 [ -z "${RUN_TESTS}" ] && TINKERPOP_BUILD_OPTIONS="${TINKERPOP_BUILD_OPTIONS} -DskipTests"
 [ -z "${RUN_INTEGRATION_TESTS}" ] || TINKERPOP_BUILD_OPTIONS="${TINKERPOP_BUILD_OPTIONS}
-DskipIntegrationTests=false"
 [ -z "${INCLUDE_NEO4J}" ] || TINKERPOP_BUILD_OPTIONS="${TINKERPOP_BUILD_OPTIONS} -DincludeNeo4j"
 [ -z "${BUILD_JAVA_DOCS}" ] && TINKERPOP_BUILD_OPTIONS="${TINKERPOP_BUILD_OPTIONS}
-Dmaven.javadoc.skip=true"
 
+touch gremlin-python/.glv
+
 mvn clean install process-resources ${TINKERPOP_BUILD_OPTIONS} || exit 1
 [ -z "${BUILD_JAVA_DOCS}" ] || mvn process-resources -Djavadoc || exit 1
 


Mime
View raw message