tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dkupp...@apache.org
Subject [1/2] tinkerpop git commit: Installed Python and Subversion in the Docker base image and enable Python GLV for every Docker build. [Forced Update!]
Date Wed, 30 Nov 2016 00:27:00 GMT
Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1363 3fbab6ccf -> dfe0be596 (forced update)


Installed Python and Subversion in the Docker base image and 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/d4cf1f25
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d4cf1f25
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d4cf1f25

Branch: refs/heads/TINKERPOP-1363
Commit: d4cf1f2510ade945a2721857226c147540761ce2
Parents: 16180e1
Author: Daniel Kuppitz <daniel_kuppitz@hotmail.com>
Authored: Tue Sep 13 02:30:34 2016 +0200
Committer: Daniel Kuppitz <daniel_kuppitz@hotmail.com>
Committed: Wed Nov 30 01:23:35 2016 +0100

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d4cf1f25/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 498ef23..272685a 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: users should remove
any previously generated TinkerPop Docker images).
 * Added "attachment requisite" `VertexProperty.element()` and `Property.element()` data in
GraphSON serialization.
 * Added `Vertex`, `Edge`, `VertexProperty`, and `Property` serializers to Gremlin-Python
and exposed tests that use graph object arguments.
 * `Bytecode.getSourceInstructions()` and `Bytecode.getStepInstructions()` now returns `List<Instruction>`
instead of `Iterable<Instruction>`.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d4cf1f25/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/d4cf1f25/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/d4cf1f25/docker/scripts/build.sh
----------------------------------------------------------------------
diff --git a/docker/scripts/build.sh b/docker/scripts/build.sh
index 47da2b8..14e83c2 100755
--- a/docker/scripts/build.sh
+++ b/docker/scripts/build.sh
@@ -63,6 +63,8 @@ if [ -d "/usr/src/tinkermem" ]; then
   cd /usr/src/tinkermem
 fi
 
+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