tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dkupp...@apache.org
Subject incubator-tinkerpop git commit: moved Docker integration section into contributing.asciidoc
Date Mon, 28 Mar 2016 15:48:25 GMT
Repository: incubator-tinkerpop
Updated Branches:
  refs/heads/docker 1c5385636 -> f94140576


moved Docker integration section into contributing.asciidoc


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

Branch: refs/heads/docker
Commit: f941405761755e562c12c91abad6c08b93413c27
Parents: 1c53856
Author: Daniel Kuppitz <daniel_kuppitz@hotmail.com>
Authored: Mon Mar 28 17:46:05 2016 +0200
Committer: Daniel Kuppitz <daniel_kuppitz@hotmail.com>
Committed: Mon Mar 28 17:46:05 2016 +0200

----------------------------------------------------------------------
 docs/src/dev/developer/contributing.asciidoc | 24 ++++++++++++++
 docs/src/dev/developer/docker.asciidoc       | 39 -----------------------
 docs/src/dev/developer/index.asciidoc        |  2 --
 3 files changed, 24 insertions(+), 41 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f9414057/docs/src/dev/developer/contributing.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/contributing.asciidoc b/docs/src/dev/developer/contributing.asciidoc
index 4a76184..8a4f735 100644
--- a/docs/src/dev/developer/contributing.asciidoc
+++ b/docs/src/dev/developer/contributing.asciidoc
@@ -90,6 +90,30 @@ mvn -Dmaven.javadoc.skip=true --projects tinkergraph-gremlin test
 ** Execute with the `-DuseEpoll` option to try to use Netty native transport (works on Linux,
but will fallback to Java NIO on other OS).
 * Performance Tests: `mvn verify -DskipPerformanceTests=false`
 
+[[docker-integration]]
+Docker Integration
+------------------
+
+TinkerPop provides a shell script, that can start several build tasks within a Docker container.
The
+required Docker images will be built automatically if they don't exist yet. Thus the first
invokation
+of the Docker script is expected to take some time.
+
+The script can be found under `PROJECT_HOME/docker/build.sh`. The following tasks are currently
+supported:
+
+* run standard test suite
+* run integration tests
+* build Java docs
+* build user docs
+
+A list of command line options is provided by `docker.build.sh --help`. The container will
install,
+configure and start all required dependencies, such as Hadoop.
+
+If the container is used to generate the user docs, it will start a web server and show the
URL that
+is used to host the HTML docs.
+
+After finishing all tasks, the script will immediately destroy the container.
+
 IDE Setup with Intellij
 -----------------------
 

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f9414057/docs/src/dev/developer/docker.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/docker.asciidoc b/docs/src/dev/developer/docker.asciidoc
deleted file mode 100644
index 3249ff3..0000000
--- a/docs/src/dev/developer/docker.asciidoc
+++ /dev/null
@@ -1,39 +0,0 @@
-////
-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.
-////
-[[docker-integration]]
-Docker Integration
-==================
-
-TinkerPop provides a shell script, that can start several build tasks within a Docker container.
The
-required Docker images will be built automatically if they don't exist yet. Thus the first
invokation
-of the Docker script is expected to take some time.
-
-The script can be found under `PROJECT_HOME/docker/build.sh`. The following tasks are currently
-supported:
-
-* run standard test suite
-* run integration tests 
-* build Java docs 
-* build user docs 
-
-A list of command line options is provided by `docker.build.sh --help`. The container will
install,
-configure and start all required dependencies, such as Hadoop.
-
-If the container is used to generate the user docs, it will start a web server and show the
URL that
-is used to host the HTML docs.
-
-After finishing all tasks, the script will immediately destroy the container.

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f9414057/docs/src/dev/developer/index.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/index.asciidoc b/docs/src/dev/developer/index.asciidoc
index 2090ffc..a9eb1f3 100644
--- a/docs/src/dev/developer/index.asciidoc
+++ b/docs/src/dev/developer/index.asciidoc
@@ -26,8 +26,6 @@ technical information and other internal processes related to the project.
 
 include::contributing.asciidoc[]
 
-include::docker.asciidoc[]
-
 include::release.asciidoc[]
 
 include::administration.asciidoc[]


Mime
View raw message