Change env var DOCKER_OPTS (TINKERPOP-1556) to TINKERPOP_DOCKER_OPTS
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5c430536 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5c430536 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5c430536 Branch: refs/heads/TINKERPOP-1529-variant2 Commit: 5c430536bcf5f782d06b38013ff84a714e97d6e8 Parents: a39c2fa Author: Robert Dale <robd...@gmail.com> Authored: Fri Nov 18 11:30:50 2016 -0500 Committer: Robert Dale <robd...@gmail.com> Committed: Fri Nov 18 11:30:50 2016 -0500 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 2 +- docker/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5c430536/CHANGELOG.asciidoc ---------------------------------------------------------------------- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 10e4121..fa67c56 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -31,7 +31,7 @@ TinkerPop 3.1.6 (Release Date: NOT OFFICIALLY RELEASED YET) * Fully shutdown metrics services in Gremlin Server on shutdown. * Deprecated `tryRandomCommit()` in `AbstractGremlinTest` - the annotation was never added in 3.1.1, and was only deprecated via javadoc. * Minor fixes to various test feature requirements in `gremlin-test`. -* Allow developers to pass options to `docker run` with DOCKER_OPTS environment variable +* Allow developers to pass options to `docker run` with TINKERPOP_DOCKER_OPTS environment variable Improvements ^^^^^^^^^^^^ http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5c430536/docker/build.sh ---------------------------------------------------------------------- diff --git a/docker/build.sh b/docker/build.sh index c314e5e..a102f83 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -47,6 +47,6 @@ CMD ["sh", "-c", "docker/scripts/build.sh $@"] EOF docker build -t tinkerpop:${BUILD_TAG} . -docker run ${DOCKER_OPTS} --rm -ti tinkerpop:${BUILD_TAG} +docker run ${TINKERPOP_DOCKER_OPTS} --rm -ti tinkerpop:${BUILD_TAG} popd > /dev/null