Repository: bigtop Updated Branches: refs/heads/master 42eeb059e -> 4701d1599
BIGTOP-2753: Initial support for Debian-9 Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/4701d159 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/4701d159 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/4701d159 Branch: refs/heads/master Commit: 4701d1599f7e6c7a38629a09132be2c6dda59aa6 Parents: 42eeb05 Author: Olaf Flebbe <[email protected]> Authored: Mon May 1 15:09:22 2017 +0200 Committer: Olaf Flebbe <[email protected]> Committed: Wed May 3 21:16:32 2017 +0200 ---------------------------------------------------------------------- bigtop_toolchain/bin/puppetize.sh | 4 ++++ bigtop_toolchain/manifests/jdk.pp | 4 +++- bigtop_toolchain/manifests/packages.pp | 14 ++++++++++---- docker/bigtop-puppet/debian-9/Dockerfile | 20 ++++++++++++++++++++ docker/bigtop-puppet/debian-9/build.sh | 16 ++++++++++++++++ docker/bigtop-slaves/debian-9/Dockerfile | 23 +++++++++++++++++++++++ 6 files changed, 76 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/4701d159/bigtop_toolchain/bin/puppetize.sh ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/bin/puppetize.sh b/bigtop_toolchain/bin/puppetize.sh index b0134f0..a5ae590 100755 --- a/bigtop_toolchain/bin/puppetize.sh +++ b/bigtop_toolchain/bin/puppetize.sh @@ -60,6 +60,10 @@ case ${ID}-${VERSION_ID} in apt-get update apt-get -y install curl sudo unzip puppet ;; + debian-9*) + apt-get update + apt-get -y install wget curl sudo unzip puppet + ;; opensuse-*) zypper --gpg-auto-import-keys install -y curl sudo unzip wget puppet suse-release ca-certificates-mozilla net-tools tar ;; http://git-wip-us.apache.org/repos/asf/bigtop/blob/4701d159/bigtop_toolchain/manifests/jdk.pp ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/manifests/jdk.pp b/bigtop_toolchain/manifests/jdk.pp index 6ba3218..8c1518b 100644 --- a/bigtop_toolchain/manifests/jdk.pp +++ b/bigtop_toolchain/manifests/jdk.pp @@ -17,7 +17,9 @@ class bigtop_toolchain::jdk { case $::operatingsystem { /Debian/: { require apt - require apt::backports + unless $os[release][major] > "8" { + require apt::backports + } package { 'openjdk-8-jdk' : ensure => present, http://git-wip-us.apache.org/repos/asf/bigtop/blob/4701d159/bigtop_toolchain/manifests/packages.pp ---------------------------------------------------------------------- diff --git a/bigtop_toolchain/manifests/packages.pp b/bigtop_toolchain/manifests/packages.pp index d89fa4b..6101e35 100644 --- a/bigtop_toolchain/manifests/packages.pp +++ b/bigtop_toolchain/manifests/packages.pp @@ -157,7 +157,14 @@ class bigtop_toolchain::packages { "bzip2-devel", "libffi-devel" ] } - /(Ubuntu|Debian)/: { $pkgs = [ + /(Ubuntu|Debian)/: { + # Debian-9 is using mariadb instead of mysql + if ($operatingsystem == "Debian") and ($os[release][major] > "8") { + $mysql_dev="libmariadb-dev" + } else { + $mysql_dev="libmysqlclient-dev" + } + $pkgs = [ "unzip", "curl", "wget", @@ -192,7 +199,7 @@ class bigtop_toolchain::packages { "libsqlite3-dev", "libldap2-dev", "libsasl2-dev", - "libmysqlclient-dev", + $mysql_dev, "python-setuptools", "libkrb5-dev", "asciidoc", @@ -202,8 +209,7 @@ class bigtop_toolchain::packages { "libboost-regex-dev", "xfslibs-dev", "libbz2-dev", - "libreadline6", - "libreadline6-dev", + "libreadline-dev", "zlib1g", "libapr1", "libapr1-dev", http://git-wip-us.apache.org/repos/asf/bigtop/blob/4701d159/docker/bigtop-puppet/debian-9/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/bigtop-puppet/debian-9/Dockerfile b/docker/bigtop-puppet/debian-9/Dockerfile new file mode 100644 index 0000000..26a4095 --- /dev/null +++ b/docker/bigtop-puppet/debian-9/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 debian:9 +MAINTAINER [email protected] + +COPY puppetize.sh /tmp/puppetize.sh + +RUN bash /tmp/puppetize.sh http://git-wip-us.apache.org/repos/asf/bigtop/blob/4701d159/docker/bigtop-puppet/debian-9/build.sh ---------------------------------------------------------------------- diff --git a/docker/bigtop-puppet/debian-9/build.sh b/docker/bigtop-puppet/debian-9/build.sh new file mode 100755 index 0000000..cdc4623 --- /dev/null +++ b/docker/bigtop-puppet/debian-9/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 --pull=true -t bigtop/puppet:debian-9 . http://git-wip-us.apache.org/repos/asf/bigtop/blob/4701d159/docker/bigtop-slaves/debian-9/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/bigtop-slaves/debian-9/Dockerfile b/docker/bigtop-slaves/debian-9/Dockerfile new file mode 100644 index 0000000..69229d1 --- /dev/null +++ b/docker/bigtop-slaves/debian-9/Dockerfile @@ -0,0 +1,23 @@ +# 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 bigtop/puppet:debian-9 +MAINTAINER [email protected] + +COPY bigtop_toolchain /usr/share/puppet/modules/bigtop_toolchain + +RUN apt-get clean && apt-get update && puppet apply -e "include bigtop_toolchain::installer" + +COPY . /tmp/bigtop +RUN cd /tmp/bigtop && ./gradlew && cd && rm -rf /tmp/bigtop
