You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by iw...@apache.org on 2021/11/16 06:39:29 UTC
[bigtop] branch branch-3.0 updated: BIGTOP-3600 - Add Debian 11 support to the Docker provisioner (#829)
This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 473de60 BIGTOP-3600 - Add Debian 11 support to the Docker provisioner (#829)
473de60 is described below
commit 473de6093a6d6af09e6881197966585c45a8a20d
Author: Luca Toscano <el...@users.noreply.github.com>
AuthorDate: Tue Nov 16 07:26:36 2021 +0100
BIGTOP-3600 - Add Debian 11 support to the Docker provisioner (#829)
(cherry picked from commit b312bcd3bfb11b9d13112a783ddfd373c87a8818)
---
bigtop_toolchain/bin/puppetize.sh | 2 +-
bigtop_toolchain/manifests/packages.pp | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/bigtop_toolchain/bin/puppetize.sh b/bigtop_toolchain/bin/puppetize.sh
index 42fb5a4..0b05cb5 100755
--- a/bigtop_toolchain/bin/puppetize.sh
+++ b/bigtop_toolchain/bin/puppetize.sh
@@ -38,7 +38,7 @@ case ${ID}-${VERSION_ID} in
apt-get update
apt-get -y install wget curl sudo unzip puppet puppet-module-puppetlabs-apt puppet-module-puppetlabs-stdlib systemd-sysv
;;
- debian-10*)
+ debian-10*|debian-11*)
apt-get update
apt-get -y install wget curl sudo unzip puppet puppet-module-puppetlabs-apt puppet-module-puppetlabs-stdlib systemd-sysv gnupg procps
;;
diff --git a/bigtop_toolchain/manifests/packages.pp b/bigtop_toolchain/manifests/packages.pp
index 522fa06..93e6c0a 100644
--- a/bigtop_toolchain/manifests/packages.pp
+++ b/bigtop_toolchain/manifests/packages.pp
@@ -151,7 +151,7 @@ class bigtop_toolchain::packages {
"libffi-devel"
] }
/(Ubuntu|Debian)/: {
- $pkgs = [
+ $_pkgs = [
"unzip",
"curl",
"wget",
@@ -181,7 +181,6 @@ class bigtop_toolchain::packages {
"dh-python",
"libfuse2",
"libjansi-java",
- "python2.7-dev",
"libxml2-dev",
"libxslt1-dev",
"zlib1g-dev",
@@ -206,10 +205,14 @@ class bigtop_toolchain::packages {
"libcurl4-gnutls-dev",
"bison",
"flex",
- "python-dev",
"python-setuptools",
"libffi-dev"
]
+ if ($operatingsystem == 'Debian' and versioncmp($operatingsystemmajrelease, '10') < 0) {
+ $pkgs = concat($_pkgs, ["python-dev", "python2.7-dev"])
+ } else {
+ $pkgs = concat($_pkgs, ["python3-dev"])
+ }
file { '/etc/apt/apt.conf.d/01retries':
content => 'Aquire::Retries "5";'
} -> Package <| |>