You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by co...@apache.org on 2016/10/13 19:54:47 UTC
bigtop git commit: BIGTOP-2542: Some files related to docker
provisioner breaks RAT
Repository: bigtop
Updated Branches:
refs/heads/master 8c28dc439 -> 2b0d4a56f
BIGTOP-2542: Some files related to docker provisioner breaks RAT
Signed-off-by: Konstantin Boudnik <ko...@epam.com>
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/2b0d4a56
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/2b0d4a56
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/2b0d4a56
Branch: refs/heads/master
Commit: 2b0d4a56fdf8a2427470c3fa454bb18bd173884b
Parents: 8c28dc4
Author: Kengo Seki <se...@apache.org>
Authored: Tue Oct 11 02:01:22 2016 +0900
Committer: Konstantin Boudnik <ko...@epam.com>
Committed: Thu Oct 13 12:54:42 2016 -0700
----------------------------------------------------------------------
build.gradle | 7 ++++++-
pom.xml | 5 +++++
provisioner/docker/docker-compose.yml | 15 +++++++++++++++
3 files changed, 26 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/2b0d4a56/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 9c6f46e..b560ba2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -115,6 +115,8 @@ rat {
"bigtop-repos/apt/distributions",
/* Juju charm files with rigid structure */
"bigtop-packages/src/charm/**/wheelhouse.txt",
+ "bigtop-packages/src/charm/**/*.json",
+ "bigtop-packages/src/charm/**/*.svg",
"bigtop-packages/src/charm/**/*.yaml",
"bigtop-deploy/juju/**/*.yaml",
"bigtop-tests/cloud-weather-report/**/*.yaml",
@@ -130,7 +132,10 @@ rat {
"bigtop-deploy/puppet/modules/qfs/README.md",
"bigtop-deploy/puppet/config/site.csv.example",
"dl/**",
- "bigtop-deploy/puppet/modules/gpdb/templates/**"
+ "bigtop-deploy/puppet/modules/gpdb/templates/**",
+ "provisioner/docker/config/hiera.yaml",
+ "provisioner/docker/config/hieradata/PLACEHOLDER",
+ "provisioner/docker/config/hosts",
]
}
http://git-wip-us.apache.org/repos/asf/bigtop/blob/2b0d4a56/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b25bce7..2d4cb76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -340,6 +340,8 @@
<exclude>bigtop-repos/apt/distributions</exclude>
<!-- Juju charm files with rigid structure -->
<exclude>bigtop-packages/src/charm/**/wheelhouse.txt</exclude>
+ <exclude>bigtop-packages/src/charm/**/*.json</exclude>
+ <exclude>bigtop-packages/src/charm/**/*.svg</exclude>
<exclude>bigtop-packages/src/charm/**/*.yaml</exclude>
<exclude>bigtop-deploy/juju/**/*.yaml</exclude>
<exclude>bigtop-tests/cloud-weather-report/**/*.yaml</exclude>
@@ -360,6 +362,9 @@
<exclude>bigtop-deploy/puppet/config/site.csv.example</exclude>
<exclude>dl/**</exclude>
<exclude>bigtop-deploy/puppet/modules/gpdb/templates/**</exclude>
+ <exclude>provisioner/docker/config/hiera.yaml</exclude>
+ <exclude>provisioner/docker/config/hieradata/PLACEHOLDER</exclude>
+ <exclude>provisioner/docker/config/hosts</exclude>
</excludes>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/bigtop/blob/2b0d4a56/provisioner/docker/docker-compose.yml
----------------------------------------------------------------------
diff --git a/provisioner/docker/docker-compose.yml b/provisioner/docker/docker-compose.yml
index d71b247..df107ae 100644
--- a/provisioner/docker/docker-compose.yml
+++ b/provisioner/docker/docker-compose.yml
@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
bigtop:
image: ${DOCKER_IMAGE}
command: /sbin/init