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 2015/09/14 19:39:41 UTC
bigtop git commit: BIGTOP-2017: Rebase bigtop-slaves on bigtop-puppet
Repository: bigtop
Updated Branches:
refs/heads/master 55a5f4f6d -> fc6a42420
BIGTOP-2017: Rebase bigtop-slaves on bigtop-puppet
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/fc6a4242
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/fc6a4242
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/fc6a4242
Branch: refs/heads/master
Commit: fc6a424206cd3d84317d2640e52730eee3749b1b
Parents: 55a5f4f
Author: Olaf Flebbe <of...@oflebbe.de>
Authored: Tue Sep 8 21:49:23 2015 +0200
Committer: Olaf Flebbe <of...@oflebbe.de>
Committed: Mon Sep 14 19:37:48 2015 +0200
----------------------------------------------------------------------
docker/bigtop-slaves/centos-6/Dockerfile | 6 ++----
docker/bigtop-slaves/centos-7/Dockerfile | 6 ++----
docker/bigtop-slaves/debian-8/Dockerfile | 6 ++----
docker/bigtop-slaves/fedora-20/Dockerfile | 8 ++------
docker/bigtop-slaves/opensuse-13.2/Dockerfile | 5 ++---
docker/bigtop-slaves/ubuntu-14.04/Dockerfile | 6 ++----
6 files changed, 12 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/fc6a4242/docker/bigtop-slaves/centos-6/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/bigtop-slaves/centos-6/Dockerfile b/docker/bigtop-slaves/centos-6/Dockerfile
index 1868221..e5dba07 100644
--- a/docker/bigtop-slaves/centos-6/Dockerfile
+++ b/docker/bigtop-slaves/centos-6/Dockerfile
@@ -12,12 +12,10 @@
# 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.
-FROM centos:6
+FROM bigtop/puppet:centos-6
MAINTAINER oflebbe@apache.org
COPY bigtop_toolchain /etc/puppet/modules/bigtop_toolchain
-RUN rpm -ivh http://yum.puppetlabs.com/puppetlabs-release-el-6.noarch.rpm; \
- yum -y install curl sudo unzip wget puppet tar ; \
- puppet apply -e "include bigtop_toolchain::puppet-modules" ; \
+RUN puppet apply -e "include bigtop_toolchain::puppet-modules" ; \
puppet apply -e "include bigtop_toolchain::installer"
http://git-wip-us.apache.org/repos/asf/bigtop/blob/fc6a4242/docker/bigtop-slaves/centos-7/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/bigtop-slaves/centos-7/Dockerfile b/docker/bigtop-slaves/centos-7/Dockerfile
index 09565d6..1332cc5 100644
--- a/docker/bigtop-slaves/centos-7/Dockerfile
+++ b/docker/bigtop-slaves/centos-7/Dockerfile
@@ -12,12 +12,10 @@
# 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.
-FROM centos:7
+FROM bigtop/puppet:centos-7
MAINTAINER oflebbe@apache.org
COPY bigtop_toolchain /etc/puppet/modules/bigtop_toolchain
-RUN rpm -ivh http://yum.puppetlabs.com/puppetlabs-release-el-7.noarch.rpm; \
- yum -y install hostname curl sudo unzip wget puppet; \
- puppet apply -e "include bigtop_toolchain::puppet-modules"; \
+RUN puppet apply -e "include bigtop_toolchain::puppet-modules" ; \
puppet apply -e "include bigtop_toolchain::installer"
http://git-wip-us.apache.org/repos/asf/bigtop/blob/fc6a4242/docker/bigtop-slaves/debian-8/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/bigtop-slaves/debian-8/Dockerfile b/docker/bigtop-slaves/debian-8/Dockerfile
index 81b9a6e..a7659ae 100644
--- a/docker/bigtop-slaves/debian-8/Dockerfile
+++ b/docker/bigtop-slaves/debian-8/Dockerfile
@@ -12,12 +12,10 @@
# 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.
-FROM debian:8
+FROM bigtop/puppet:debian-8
MAINTAINER oflebbe@apache.org
COPY bigtop_toolchain /etc/puppet/modules/bigtop_toolchain
-RUN apt-get update; \
- apt-get -y install puppet curl; \
- puppet apply -e "include bigtop_toolchain::puppet-modules" ; \
+RUN puppet apply -e "include bigtop_toolchain::puppet-modules" ; \
puppet apply -e "include bigtop_toolchain::installer"
http://git-wip-us.apache.org/repos/asf/bigtop/blob/fc6a4242/docker/bigtop-slaves/fedora-20/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/bigtop-slaves/fedora-20/Dockerfile b/docker/bigtop-slaves/fedora-20/Dockerfile
index 88c85d3..9e28bee 100644
--- a/docker/bigtop-slaves/fedora-20/Dockerfile
+++ b/docker/bigtop-slaves/fedora-20/Dockerfile
@@ -12,14 +12,10 @@
# 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.
-FROM fedora:20
+FROM bigtop/puppet:fedora-20
MAINTAINER oflebbe@apache.org
COPY bigtop_toolchain /etc/puppet/modules/bigtop_toolchain
-RUN yum -y install yum-utils; yum-config-manager --enable updates-testing ; \
- rpm -ivh https://yum.puppetlabs.com/puppetlabs-release-fedora-20.noarch.rpm; \
- yum update; \
- yum -y install hostname curl sudo unzip wget puppet ; \
- puppet apply -e "include bigtop_toolchain::puppet-modules" ; \
+RUN puppet apply -e "include bigtop_toolchain::puppet-modules" ; \
puppet apply -e "include bigtop_toolchain::installer"
http://git-wip-us.apache.org/repos/asf/bigtop/blob/fc6a4242/docker/bigtop-slaves/opensuse-13.2/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/bigtop-slaves/opensuse-13.2/Dockerfile b/docker/bigtop-slaves/opensuse-13.2/Dockerfile
index 0be5486..59064f3 100644
--- a/docker/bigtop-slaves/opensuse-13.2/Dockerfile
+++ b/docker/bigtop-slaves/opensuse-13.2/Dockerfile
@@ -12,11 +12,10 @@
# 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.
-FROM opensuse:13.2
+FROM bigtop/puppet:opensuse-13.2
MAINTAINER evansye@apache.org
COPY bigtop_toolchain /etc/puppet/modules/bigtop_toolchain
-RUN zypper --gpg-auto-import-keys install -y curl sudo unzip wget puppet suse-release ca-certificates-mozilla net-tools tar ; \
- puppet apply -e "include bigtop_toolchain::puppet-modules" ; \
+RUN puppet apply -e "include bigtop_toolchain::puppet-modules" ; \
puppet apply -e "include bigtop_toolchain::installer"
http://git-wip-us.apache.org/repos/asf/bigtop/blob/fc6a4242/docker/bigtop-slaves/ubuntu-14.04/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/bigtop-slaves/ubuntu-14.04/Dockerfile b/docker/bigtop-slaves/ubuntu-14.04/Dockerfile
index f6e02aa..cafcd69 100644
--- a/docker/bigtop-slaves/ubuntu-14.04/Dockerfile
+++ b/docker/bigtop-slaves/ubuntu-14.04/Dockerfile
@@ -12,12 +12,10 @@
# 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.
-FROM ubuntu:14.04
+FROM bigtop/puppet:ubuntu-14.04
MAINTAINER oflebbe@apache.org
COPY bigtop_toolchain /etc/puppet/modules/bigtop_toolchain
-RUN apt-get update; \
- apt-get -y install curl sudo unzip wget puppet software-properties-common ;\
- puppet apply -e "include bigtop_toolchain::puppet-modules" ; \
+RUN puppet apply -e "include bigtop_toolchain::puppet-modules" ; \
puppet apply -e "include bigtop_toolchain::installer"