You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by of...@apache.org on 2016/08/09 18:27:08 UTC
[05/11] bigtop git commit: BIGTOP-2508. Make Docker Provisioner to
work with Docker on Mac
BIGTOP-2508. Make Docker Provisioner to work with Docker on Mac
Signed-off-by: Olaf Flebbe <of...@oflebbe.de>
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/71b0ee3e
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/71b0ee3e
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/71b0ee3e
Branch: refs/heads/BIGTOP-2253
Commit: 71b0ee3e7fc0c79ae689b3ae82ac3d5c0ba3641b
Parents: 40a5287
Author: Evans Ye <ev...@apache.org>
Authored: Sun Jul 10 15:33:22 2016 +0800
Committer: Olaf Flebbe <of...@oflebbe.de>
Committed: Tue Aug 9 20:26:21 2016 +0200
----------------------------------------------------------------------
provisioner/docker/config/hiera.yaml | 1 +
provisioner/docker/config/hieradata/PLACEHOLDER | 0
provisioner/docker/config/hosts | 1 +
provisioner/docker/docker-hadoop.sh | 4 +++-
4 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/71b0ee3e/provisioner/docker/config/hiera.yaml
----------------------------------------------------------------------
diff --git a/provisioner/docker/config/hiera.yaml b/provisioner/docker/config/hiera.yaml
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/provisioner/docker/config/hiera.yaml
@@ -0,0 +1 @@
+
http://git-wip-us.apache.org/repos/asf/bigtop/blob/71b0ee3e/provisioner/docker/config/hieradata/PLACEHOLDER
----------------------------------------------------------------------
diff --git a/provisioner/docker/config/hieradata/PLACEHOLDER b/provisioner/docker/config/hieradata/PLACEHOLDER
new file mode 100644
index 0000000..e69de29
http://git-wip-us.apache.org/repos/asf/bigtop/blob/71b0ee3e/provisioner/docker/config/hosts
----------------------------------------------------------------------
diff --git a/provisioner/docker/config/hosts b/provisioner/docker/config/hosts
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/provisioner/docker/config/hosts
@@ -0,0 +1 @@
+
http://git-wip-us.apache.org/repos/asf/bigtop/blob/71b0ee3e/provisioner/docker/docker-hadoop.sh
----------------------------------------------------------------------
diff --git a/provisioner/docker/docker-hadoop.sh b/provisioner/docker/docker-hadoop.sh
index 4b1c0df..9c7794f 100755
--- a/provisioner/docker/docker-hadoop.sh
+++ b/provisioner/docker/docker-hadoop.sh
@@ -125,7 +125,9 @@ destroy() {
docker-compose -p $PROVISION_ID stop
docker-compose -p $PROVISION_ID rm -f
fi
- rm -rvf ./config .provision_id
+ echo > ./config/hiera.yaml
+ echo > ./config/hosts
+ rm -rvf ./config/hieradata/bigtop ./config/hieradata/site.yaml .provision_id
}
bigtop-puppet() {