Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/31a3b444 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/31a3b444 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/31a3b444 Branch: refs/heads/TINKERPOP-1975 Commit: 31a3b444ec290b3868337edb664348efbbd567ee Parents: f2e74ff 6f6d941 Author: Florian Hockmann <[email protected]> Authored: Mon Jun 4 16:05:04 2018 +0200 Committer: Florian Hockmann <[email protected]> Committed: Mon Jun 4 16:05:04 2018 +0200 ---------------------------------------------------------------------- .dockerignore | 2 + CHANGELOG.asciidoc | 2 +- docker/hadoop/Dockerfile | 25 ++++++++ .../developer/development-environment.asciidoc | 22 ++++++- docs/src/dev/developer/release.asciidoc | 8 ++- .../src/reference/gremlin-applications.asciidoc | 65 ++++++++++++++++++++ gremlin-console/Dockerfile | 31 ++++++++++ gremlin-console/pom.xml | 64 +++++++++++++++++++ .../src/main/docker/docker-entrypoint.sh | 24 ++++++++ .../gremlin/driver/ResultQueueTest.java | 2 +- gremlin-server/Dockerfile | 35 +++++++++++ gremlin-server/pom.xml | 64 +++++++++++++++++++ .../src/main/docker/docker-entrypoint.sh | 31 ++++++++++ pom.xml | 35 +++++++++++ 14 files changed, 406 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/31a3b444/CHANGELOG.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/31a3b444/docs/src/dev/developer/development-environment.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/31a3b444/docs/src/dev/developer/release.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/31a3b444/docs/src/reference/gremlin-applications.asciidoc ---------------------------------------------------------------------- diff --cc docs/src/reference/gremlin-applications.asciidoc index 26ec185,273e5c7..bf0875a --- a/docs/src/reference/gremlin-applications.asciidoc +++ b/docs/src/reference/gremlin-applications.asciidoc @@@ -2080,9 -1930,42 +2112,42 @@@ $ curl -X POST -d "{\"gremlin\":\"divid {"message":"Error encountered evaluating script: divideIt(8, 2)"} ---- -In the above REST-based requests, the bindings contain a special parameter that tells the `ScriptEngine` cache to +In the above HTTP-based requests, the bindings contain a special parameter that tells the `ScriptEngine` cache to immediately forget the script after execution. In this way, the function does not end up being globally available. + [[gremlin-server-docker-image]] + === Docker Image + The Gremlin Server can also be started as a link:https://hub.docker.com/r/tinkerpop/gremlin-server/[Docker image]: + + [source,text] + ---- + $ docker run tinkerpop/gremlin-server:x.y.z + [INFO] GremlinServer - + \,,,/ + (o o) + -----oOOo-(3)-oOOo----- + + [INFO] GremlinServer - Configuring Gremlin Server from conf/gremlin-server.yaml + ... + [INFO] GremlinServer$1 - Gremlin Server configured with worker thread pool of 1, gremlin pool of 4 and boss thread pool of 1. + [INFO] GremlinServer$1 - Channel started at port 8182. + ---- + + By default, Gremlin Server listens on port 8182. So that port needs to be exposed if it should be reachable on the host: + + [source,bash] + ---- + $ docker run -p 8182:8182 tinkerpop/gremlin-server:x.y.z + ---- + + Arguments provided with `docker run` are forwarded to the script that starts Gremlin Server. This allows for example + to use an alternative config file: + + [source,bash] + ---- + $ docker run tinkerpop/gremlin-server:x.y.z conf/gremlin-server-secure.yaml + ---- + [[gremlin-plugins]] == Gremlin Plugins http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/31a3b444/gremlin-console/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/31a3b444/gremlin-server/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/31a3b444/pom.xml ----------------------------------------------------------------------
