Repository: bigtop Updated Branches: refs/heads/master 4ee8f075f -> 11eb2d26f
BIGTOP-2674. docker-hadoop option -C does not work correctly any more Signed-off-by: Olaf Flebbe <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/11eb2d26 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/11eb2d26 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/11eb2d26 Branch: refs/heads/master Commit: 11eb2d26f19b26cde7b015330abe6d4579833319 Parents: 4ee8f07 Author: Evans Ye <[email protected]> Authored: Sun Jan 22 23:03:35 2017 +0800 Committer: Olaf Flebbe <[email protected]> Committed: Sun Jan 22 18:12:54 2017 +0100 ---------------------------------------------------------------------- provisioner/docker/docker-hadoop.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/11eb2d26/provisioner/docker/docker-hadoop.sh ---------------------------------------------------------------------- diff --git a/provisioner/docker/docker-hadoop.sh b/provisioner/docker/docker-hadoop.sh index 3495301..80daf67 100755 --- a/provisioner/docker/docker-hadoop.sh +++ b/provisioner/docker/docker-hadoop.sh @@ -43,6 +43,8 @@ create() { mkdir -p config/hieradata 2> /dev/null echo > ./config/hiera.yaml echo > ./config/hosts + export DOCKER_IMAGE=$(get-yaml-config docker image) + export MEM_LIMIT=$(get-yaml-config docker memory_limit) # Startup instances docker-compose -p $PROVISION_ID scale bigtop=$1 @@ -192,8 +194,6 @@ fi if [ -n "$PROVISION_ID" ]; then NODES=(`docker-compose -p $PROVISION_ID ps -q`) fi -export DOCKER_IMAGE=$(get-yaml-config docker image) -export MEM_LIMIT=$(get-yaml-config docker memory_limit) while [ $# -gt 0 ]; do case "$1" in
