BIGTOP-2018: Create a puppetizing script

Signed-off-by: Evans Ye <evansye@apache.org>

12 files changed, 24 insertions, 11 deletions

diff --git a/docker/bigtop-puppet/centos-6/Dockerfile b/docker/bigtop-puppet/centos-6/Dockerfile
index 6e845d4b..93983033 100644
--- a/docker/bigtop-puppet/centos-6/Dockerfile
+++ b/docker/bigtop-puppet/centos-6/Dockerfile
@@ -15,5 +15,6 @@
 FROM centos:6
 MAINTAINER evansye@apache.org
 
-RUN rpm -ivh http://yum.puppetlabs.com/puppetlabs-release-el-6.noarch.rpm; \
-    yum -y install curl sudo unzip wget puppet
+COPY puppetize.sh /tmp/puppetize.sh
+
+RUN bash /tmp/puppetize.sh
diff --git a/docker/bigtop-puppet/centos-6/build.sh b/docker/bigtop-puppet/centos-6/build.sh
index 58a169e0..daf209f6 100755
--- a/docker/bigtop-puppet/centos-6/build.sh
+++ b/docker/bigtop-puppet/centos-6/build.sh
@@ -12,4 +12,5 @@
 # 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.
+cp ../../../bigtop_toolchain/bin/puppetize.sh .
 docker build -t bigtop/puppet:centos-6 .
diff --git a/docker/bigtop-puppet/centos-7/Dockerfile b/docker/bigtop-puppet/centos-7/Dockerfile
index a145f4a7..bd25fa44 100644
--- a/docker/bigtop-puppet/centos-7/Dockerfile
+++ b/docker/bigtop-puppet/centos-7/Dockerfile
@@ -15,5 +15,6 @@
 FROM centos:7
 MAINTAINER evansye@apache.org
 
-RUN rpm -ivh http://yum.puppetlabs.com/puppetlabs-release-el-7.noarch.rpm; \
-    yum -y install hostname curl sudo unzip wget puppet
+COPY puppetize.sh /tmp/puppetize.sh
+
+RUN bash /tmp/puppetize.sh
diff --git a/docker/bigtop-puppet/centos-7/build.sh b/docker/bigtop-puppet/centos-7/build.sh
index f373b02c..742ad5d6 100755
--- a/docker/bigtop-puppet/centos-7/build.sh
+++ b/docker/bigtop-puppet/centos-7/build.sh
@@ -12,4 +12,5 @@
 # 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.
+cp ../../../bigtop_toolchain/bin/puppetize.sh .
 docker build -t bigtop/puppet:centos-7 .
diff --git a/docker/bigtop-puppet/debian-8/Dockerfile b/docker/bigtop-puppet/debian-8/Dockerfile
index 5c3d38d7..d015ca6d 100644
--- a/docker/bigtop-puppet/debian-8/Dockerfile
+++ b/docker/bigtop-puppet/debian-8/Dockerfile
@@ -15,5 +15,6 @@
 FROM debian:8
 MAINTAINER evansye@apache.org
 
-RUN apt-get update; \
-    apt-get -y install curl sudo unzip wget puppet
+COPY puppetize.sh /tmp/puppetize.sh
+
+RUN bash /tmp/puppetize.sh
diff --git a/docker/bigtop-puppet/debian-8/build.sh b/docker/bigtop-puppet/debian-8/build.sh
index 30ce3a4a..00666a7c 100755
--- a/docker/bigtop-puppet/debian-8/build.sh
+++ b/docker/bigtop-puppet/debian-8/build.sh
@@ -12,4 +12,5 @@
 # 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.
+cp ../../../bigtop_toolchain/bin/puppetize.sh .
 docker build -t bigtop/puppet:debian-8 .
diff --git a/docker/bigtop-puppet/fedora-20/Dockerfile b/docker/bigtop-puppet/fedora-20/Dockerfile
index 90f79a94..271c7ac0 100644
--- a/docker/bigtop-puppet/fedora-20/Dockerfile
+++ b/docker/bigtop-puppet/fedora-20/Dockerfile
@@ -15,5 +15,6 @@
 FROM fedora:20
 MAINTAINER evansye@apache.org
 
-RUN rpm -ivh http://yum.puppetlabs.com/puppetlabs-release-el-7.noarch.rpm; \
-    yum -y install hostname curl sudo unzip wget puppet
+COPY puppetize.sh /tmp/puppetize.sh
+
+RUN bash /tmp/puppetize.sh
diff --git a/docker/bigtop-puppet/fedora-20/build.sh b/docker/bigtop-puppet/fedora-20/build.sh
index 06b065f7..37801faf 100755
--- a/docker/bigtop-puppet/fedora-20/build.sh
+++ b/docker/bigtop-puppet/fedora-20/build.sh
@@ -12,4 +12,5 @@
 # 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.
+cp ../../../bigtop_toolchain/bin/puppetize.sh .
 docker build -t bigtop/puppet:fedora-20 .
diff --git a/docker/bigtop-puppet/opensuse-13.2/Dockerfile b/docker/bigtop-puppet/opensuse-13.2/Dockerfile
index c5dbe254..9c41f635 100644
--- a/docker/bigtop-puppet/opensuse-13.2/Dockerfile
+++ b/docker/bigtop-puppet/opensuse-13.2/Dockerfile
@@ -15,4 +15,6 @@
 FROM opensuse:13.2
 MAINTAINER evansye@apache.org
 
-RUN zypper --gpg-auto-import-keys install -y curl sudo unzip wget puppet suse-release ca-certificates-mozilla
+COPY puppetize.sh /tmp/puppetize.sh
+
+RUN bash /tmp/puppetize.sh
diff --git a/docker/bigtop-puppet/opensuse-13.2/build.sh b/docker/bigtop-puppet/opensuse-13.2/build.sh
index 9be04ce3..049c62ac 100755
--- a/docker/bigtop-puppet/opensuse-13.2/build.sh
+++ b/docker/bigtop-puppet/opensuse-13.2/build.sh
@@ -12,4 +12,5 @@
 # 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.
+cp ../../../bigtop_toolchain/bin/puppetize.sh .
 docker build -t bigtop/puppet:opensuse-13.2 .
diff --git a/docker/bigtop-puppet/ubuntu-14.04/Dockerfile b/docker/bigtop-puppet/ubuntu-14.04/Dockerfile
index 2cb725e3..dc6db634 100644
--- a/docker/bigtop-puppet/ubuntu-14.04/Dockerfile
+++ b/docker/bigtop-puppet/ubuntu-14.04/Dockerfile
@@ -15,5 +15,6 @@
 FROM ubuntu:14.04
 MAINTAINER evansye@apache.org
 
-RUN apt-get update; \
-    apt-get -y install curl sudo unzip wget puppet
+COPY puppetize.sh /tmp/puppetize.sh
+
+RUN bash /tmp/puppetize.sh
diff --git a/docker/bigtop-puppet/ubuntu-14.04/build.sh b/docker/bigtop-puppet/ubuntu-14.04/build.sh
index c8c9ef75..f4df1f73 100755
--- a/docker/bigtop-puppet/ubuntu-14.04/build.sh
+++ b/docker/bigtop-puppet/ubuntu-14.04/build.sh
@@ -12,4 +12,5 @@
 # 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.
+cp ../../../bigtop_toolchain/bin/puppetize.sh .
 docker build -t bigtop/puppet:ubuntu-14.04 .