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/12/30 10:49:56 UTC
[1/2] bigtop git commit: BIGTOP-2196: Docker configuration for
ubuntu-15.04-ppc64le
Repository: bigtop
Updated Branches:
refs/heads/master 48c02c492 -> ac04aaf67
BIGTOP-2196: Docker configuration for ubuntu-15.04-ppc64le
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/ac04aaf6
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/ac04aaf6
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/ac04aaf6
Branch: refs/heads/master
Commit: ac04aaf6705db42f092fe0194c82ee8d0f58cc15
Parents: c78e635
Author: Olaf Flebbe <of...@ofleb.be>
Authored: Tue Dec 29 21:50:38 2015 +0100
Committer: Olaf Flebbe <of...@ofleb.be>
Committed: Wed Dec 30 10:45:50 2015 +0100
----------------------------------------------------------------------
.../ubuntu-15.04-ppc64le/Dockerfile | 20 ++++++++++++++++++++
.../bigtop-puppet/ubuntu-15.04-ppc64le/build.sh | 16 ++++++++++++++++
2 files changed, 36 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/ac04aaf6/docker/bigtop-puppet/ubuntu-15.04-ppc64le/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/bigtop-puppet/ubuntu-15.04-ppc64le/Dockerfile b/docker/bigtop-puppet/ubuntu-15.04-ppc64le/Dockerfile
new file mode 100755
index 0000000..34269e5
--- /dev/null
+++ b/docker/bigtop-puppet/ubuntu-15.04-ppc64le/Dockerfile
@@ -0,0 +1,20 @@
+# 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.
+FROM ppc64le/ubuntu:15.04
+MAINTAINER Amir Sanjar
+
+COPY puppetize.sh /tmp/puppetize.sh
+
+RUN bash /tmp/puppetize.sh
http://git-wip-us.apache.org/repos/asf/bigtop/blob/ac04aaf6/docker/bigtop-puppet/ubuntu-15.04-ppc64le/build.sh
----------------------------------------------------------------------
diff --git a/docker/bigtop-puppet/ubuntu-15.04-ppc64le/build.sh b/docker/bigtop-puppet/ubuntu-15.04-ppc64le/build.sh
new file mode 100755
index 0000000..f0def13
--- /dev/null
+++ b/docker/bigtop-puppet/ubuntu-15.04-ppc64le/build.sh
@@ -0,0 +1,16 @@
+# 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.
+cp ../../../bigtop_toolchain/bin/puppetize.sh .
+docker build -t bigtop/puppet:ubuntu-15.04-ppc64le .
[2/2] bigtop git commit: BIGTOP-2191: openjdk-7 is missing in
bigtop/slave:ubuntu-14.04-ppc64le docker image
Posted by of...@apache.org.
BIGTOP-2191: openjdk-7 is missing in bigtop/slave:ubuntu-14.04-ppc64le docker image
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/c78e635a
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/c78e635a
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/c78e635a
Branch: refs/heads/master
Commit: c78e635aea166e653b95f07bfd6d1c9b976e0a09
Parents: 48c02c4
Author: Olaf Flebbe <of...@ofleb.be>
Authored: Tue Dec 29 21:44:54 2015 +0100
Committer: Olaf Flebbe <of...@ofleb.be>
Committed: Wed Dec 30 10:45:50 2015 +0100
----------------------------------------------------------------------
bigtop_toolchain/bin/puppetize.sh | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/c78e635a/bigtop_toolchain/bin/puppetize.sh
----------------------------------------------------------------------
diff --git a/bigtop_toolchain/bin/puppetize.sh b/bigtop_toolchain/bin/puppetize.sh
index 6facf14..de02db4 100755
--- a/bigtop_toolchain/bin/puppetize.sh
+++ b/bigtop_toolchain/bin/puppetize.sh
@@ -39,11 +39,13 @@ case ${ID}-${VERSION_ID} in
yum -y install hostname curl sudo unzip wget puppet
;;
ubuntu-14.04)
- # BIGTOP-2003. A workaround to install newer hiera to get rid of hiera 1.3.0 bug.
apt-get -y install wget
- wget -O /tmp/puppetlabs-release-trusty.deb https://apt.puppetlabs.com/puppetlabs-release-trusty.deb && dpkg -i /tmp/puppetlabs-release-trusty.deb
- rm -f /tmp/puppetlabs-release-trusty.deb
- apt-get update
+ if [ $HOSTTYPE = "x86_64" ] ; then
+ # BIGTOP-2003. A workaround to install newer hiera to get rid of hiera 1.3.0 bug.
+ wget -O /tmp/puppetlabs-release-trusty.deb https://apt.puppetlabs.com/puppetlabs-release-trusty.deb && dpkg -i /tmp/puppetlabs-release-trusty.deb
+ rm -f /tmp/puppetlabs-release-trusty.deb
+ apt-get update
+ fi
apt-get -y install curl sudo unzip puppet software-properties-common
;;
ubuntu-15*)