You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by rd...@apache.org on 2017/12/27 14:54:04 UTC
[1/3] tinkerpop git commit: Added docker build param KEEP_CONTAINER
to not remove container by default - CTR
Repository: tinkerpop
Updated Branches:
refs/heads/master fdb791343 -> 81302550d
Added docker build param KEEP_CONTAINER to not remove container by default - CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/47cebd48
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/47cebd48
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/47cebd48
Branch: refs/heads/master
Commit: 47cebd482723210ea983341d05cea81de8a2c0d7
Parents: e042879
Author: Robert Dale <ro...@gmail.com>
Authored: Wed Dec 27 09:10:25 2017 -0500
Committer: Robert Dale <ro...@gmail.com>
Committed: Wed Dec 27 09:10:25 2017 -0500
----------------------------------------------------------------------
docker/build.sh | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/47cebd48/docker/build.sh
----------------------------------------------------------------------
diff --git a/docker/build.sh b/docker/build.sh
index a102f83..7b83d29 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -31,6 +31,9 @@ function cleanup {
}
trap cleanup EXIT
+REMOVE_CONTAINER="--rm"
+[[ -n ${KEEP_CONTAINER} ]] && unset REMOVE_CONTAINER
+
case "$1" in
-h | --help ) ${DIR}/scripts/build.sh -h; exit 0 ;;
esac
@@ -47,6 +50,6 @@ CMD ["sh", "-c", "docker/scripts/build.sh $@"]
EOF
docker build -t tinkerpop:${BUILD_TAG} .
-docker run ${TINKERPOP_DOCKER_OPTS} --rm -ti tinkerpop:${BUILD_TAG}
+docker run ${TINKERPOP_DOCKER_OPTS} ${REMOVE_CONTAINER} -ti tinkerpop:${BUILD_TAG}
popd > /dev/null
[3/3] tinkerpop git commit: Merge branch 'tp32'
Posted by rd...@apache.org.
Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/81302550
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/81302550
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/81302550
Branch: refs/heads/master
Commit: 81302550dbc763aa16888c1403e7f52b251b1ace
Parents: fdb7913 189953a
Author: Robert Dale <ro...@gmail.com>
Authored: Wed Dec 27 09:53:21 2017 -0500
Committer: Robert Dale <ro...@gmail.com>
Committed: Wed Dec 27 09:53:21 2017 -0500
----------------------------------------------------------------------
docker/build.sh | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[2/3] tinkerpop git commit: Return exit status of docker run - CTR
Posted by rd...@apache.org.
Return exit status of docker run - CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/189953a9
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/189953a9
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/189953a9
Branch: refs/heads/master
Commit: 189953a9f02b1f5d1a65726523b6385deab05353
Parents: 47cebd4
Author: Robert Dale <ro...@gmail.com>
Authored: Wed Dec 27 09:12:09 2017 -0500
Committer: Robert Dale <ro...@gmail.com>
Committed: Wed Dec 27 09:12:09 2017 -0500
----------------------------------------------------------------------
docker/build.sh | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/189953a9/docker/build.sh
----------------------------------------------------------------------
diff --git a/docker/build.sh b/docker/build.sh
index 7b83d29..7eb46b4 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -52,4 +52,6 @@ EOF
docker build -t tinkerpop:${BUILD_TAG} .
docker run ${TINKERPOP_DOCKER_OPTS} ${REMOVE_CONTAINER} -ti tinkerpop:${BUILD_TAG}
+status=$?
popd > /dev/null
+exit $status