Remove .docker file activation option for Maven TINKERPOP-1897
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0efeb4a2 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0efeb4a2 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0efeb4a2 Branch: refs/heads/TINKERPOP-1975 Commit: 0efeb4a27cb0630cf71165e19681720a8f33ee84 Parents: 80931ce Author: Florian Hockmann <[email protected]> Authored: Wed May 23 20:33:19 2018 +0200 Committer: Florian Hockmann <[email protected]> Committed: Mon Jun 4 15:57:29 2018 +0200 ---------------------------------------------------------------------- .gitignore | 1 - docker/hadoop/Dockerfile | 25 ++++++++++++++++++++ docker/scripts/build.sh | 3 --- .../developer/development-environment.asciidoc | 4 +--- gremlin-console/pom.xml | 6 ----- gremlin-server/pom.xml | 6 ----- pom.xml | 1 - 7 files changed, 26 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 10e5b4f..0109f82 100644 --- a/.gitignore +++ b/.gitignore @@ -20,7 +20,6 @@ __pycache__/ *.py[cdo] __version__.py .glv -.docker settings.xml tools/ [Dd]ebug/ http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/docker/hadoop/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/hadoop/Dockerfile b/docker/hadoop/Dockerfile new file mode 100644 index 0000000..86b2598 --- /dev/null +++ b/docker/hadoop/Dockerfile @@ -0,0 +1,25 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +FROM tinkerpop:base + +MAINTAINER Daniel Kuppitz <[email protected]> + +ENV HADOOP_VERSION 2.7.2 + +COPY install.sh /usr/local/sbin/install-hadoop.sh +RUN /usr/local/sbin/install-hadoop.sh http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/docker/scripts/build.sh ---------------------------------------------------------------------- diff --git a/docker/scripts/build.sh b/docker/scripts/build.sh index 3d8f0d3..5ef74fc 100755 --- a/docker/scripts/build.sh +++ b/docker/scripts/build.sh @@ -67,9 +67,6 @@ touch gremlin-python/.glv touch gremlin-dotnet/src/.glv touch gremlin-dotnet/test/.glv -rm gremlin-console/.docker -rm gremlin-server/.docker - # use a custom maven settings.xml if [ -r "settings.xml" ]; then echo "Copying settings.xml" http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/docs/src/dev/developer/development-environment.asciidoc ---------------------------------------------------------------------- diff --git a/docs/src/dev/developer/development-environment.asciidoc b/docs/src/dev/developer/development-environment.asciidoc index cb20d4e..ae97d1a 100644 --- a/docs/src/dev/developer/development-environment.asciidoc +++ b/docs/src/dev/developer/development-environment.asciidoc @@ -136,9 +136,7 @@ The Docker images can be built from the command line with: ---- mvn clean install -Pdocker-images ---- -which enables the "docker-images" Maven profile or in a more automated fashion simply add a `.docker` file to the -directories of the `gremlin-server` and/or `gremlin-console` modules which will signify to Maven that Docker is present -in the environment. +which enables the "docker-images" Maven profile. [[release-environment]] http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/gremlin-console/pom.xml ---------------------------------------------------------------------- diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml index 8e8b357..b5dca0e 100644 --- a/gremlin-console/pom.xml +++ b/gremlin-console/pom.xml @@ -338,12 +338,6 @@ limitations under the License. <profile> <id>docker-images</id> - <activation> - <activeByDefault>false</activeByDefault> - <file> - <exists>.docker</exists> - </file> - </activation> <build> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/gremlin-server/pom.xml ---------------------------------------------------------------------- diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml index b2c3435..e361c9e 100644 --- a/gremlin-server/pom.xml +++ b/gremlin-server/pom.xml @@ -246,12 +246,6 @@ limitations under the License. <profile> <id>docker-images</id> - <activation> - <activeByDefault>false</activeByDefault> - <file> - <exists>.docker</exists> - </file> - </activation> <build> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 398b931..f2484f8 100644 --- a/pom.xml +++ b/pom.xml @@ -349,7 +349,6 @@ limitations under the License. <exclude>**/_bsp/**</exclude> <exclude>DEPENDENCIES</exclude> <exclude>**/.glv</exclude> - <exclude>**/.docker</exclude> <exclude>bin/gremlin.sh</exclude> <exclude>gremlin-console/bin/gremlin.sh</exclude> <exclude>**/Debug/**</exclude>
