summaryrefslogtreecommitdiff
path: root/bootstrap
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2019-12-04 12:10:27 +0100
committerStefan Metzmacher <metze@samba.org>2019-12-06 00:16:45 +0000
commiteefc8ee8e31c108114b6114df4ad006d33af1f4b (patch)
treec7e8e390ab9f0f27e32bbbdf7b50c47250c4434c /bootstrap
parent41f6248effa5f5c0606a13da289c8a77abb30bce (diff)
downloadsamba-eefc8ee8e31c108114b6114df4ad006d33af1f4b.tar.gz
bootstrap: add debian10 support
Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andreas Schneider <asn@samba.org> Autobuild-User(master): Stefan Metzmacher <metze@samba.org> Autobuild-Date(master): Fri Dec 6 00:16:45 UTC 2019 on sn-devel-184
Diffstat (limited to 'bootstrap')
-rw-r--r--bootstrap/.gitlab-ci.yml3
-rw-r--r--bootstrap/READMD.md2
-rw-r--r--bootstrap/config.py7
-rw-r--r--bootstrap/generated-dists/Vagrantfile7
-rw-r--r--bootstrap/generated-dists/debian10/Dockerfile27
-rwxr-xr-xbootstrap/generated-dists/debian10/bootstrap.sh106
-rwxr-xr-xbootstrap/generated-dists/debian10/locale.sh55
-rw-r--r--bootstrap/generated-dists/debian10/packages.yml91
-rw-r--r--bootstrap/sha1sum.txt2
9 files changed, 298 insertions, 2 deletions
diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml
index 3a012ed8cec..aa0b6448d74 100644
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -92,6 +92,9 @@ ubuntu1604:
ubuntu1404:
extends: .build_image_template_force_broken
+debian10:
+ extends: .build_image_template
+
debian9:
extends: .build_image_template
diff --git a/bootstrap/READMD.md b/bootstrap/READMD.md
index d653d6d340b..b8a30098b67 100644
--- a/bootstrap/READMD.md
+++ b/bootstrap/READMD.md
@@ -12,7 +12,7 @@ A pure python3 module with CLI to bootstrap Samba envs for multiple distribution
## Supported Distributions
-deb: Debian 7|8|9, Ubuntu 1404|1604|1804
+deb: Debian 7|8|9|10, Ubuntu 1404|1604|1804
rpm: CentOS 6|7, Fedora 28|29, openSUSE Leap 15.0|15.1
Easy to add more.
diff --git a/bootstrap/config.py b/bootstrap/config.py
index 06fd1142f94..a135456866c 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -403,6 +403,13 @@ DEB_DISTS = {
'language-pack-en': '', # included in locales
}
},
+ 'debian10': {
+ 'docker_image': 'debian:10',
+ 'vagrant_box': 'debian/buster64',
+ 'replace': {
+ 'language-pack-en': '', # included in locales
+ }
+ },
'ubuntu1404': {
'docker_image': 'ubuntu:14.04',
'vagrant_box': 'ubuntu/trusty64',
diff --git a/bootstrap/generated-dists/Vagrantfile b/bootstrap/generated-dists/Vagrantfile
index 4381dca6496..b3cb6bea485 100644
--- a/bootstrap/generated-dists/Vagrantfile
+++ b/bootstrap/generated-dists/Vagrantfile
@@ -31,6 +31,13 @@ Vagrant.configure("2") do |config|
v.vm.provision :shell, path: "centos8/locale.sh"
end
+ config.vm.define "debian10" do |v|
+ v.vm.box = "debian/buster64"
+ v.vm.hostname = "debian10"
+ v.vm.provision :shell, path: "debian10/bootstrap.sh"
+ v.vm.provision :shell, path: "debian10/locale.sh"
+ end
+
config.vm.define "debian7" do |v|
v.vm.box = "debian/wheezy64"
v.vm.hostname = "debian7"
diff --git a/bootstrap/generated-dists/debian10/Dockerfile b/bootstrap/generated-dists/debian10/Dockerfile
new file mode 100644
index 00000000000..a7141db7e17
--- /dev/null
+++ b/bootstrap/generated-dists/debian10/Dockerfile
@@ -0,0 +1,27 @@
+#
+# This file is generated by 'bootstrap/template.py --render'
+# See also bootstrap/config.py
+#
+
+FROM debian:10
+
+# pass in with --build-arg while build
+ARG SHA1SUM
+RUN [ -n $SHA1SUM ] && echo $SHA1SUM > /sha1sum.txt
+
+ADD *.sh /tmp/
+# need root permission, do it before USER samba
+RUN /tmp/bootstrap.sh && /tmp/locale.sh
+
+# if ld.gold exists, force link it to ld
+RUN set -x; LD=$(which ld); LD_GOLD=$(which ld.gold); test -x $LD_GOLD && ln -sf $LD_GOLD $LD && test -x $LD && echo "$LD is now $LD_GOLD"
+
+# make test can not work with root, so we have to create a new user
+RUN useradd -m -U -s /bin/bash samba && \
+ mkdir -p /etc/sudoers.d && \
+ echo "samba ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/samba
+
+USER samba
+WORKDIR /home/samba
+# samba tests rely on this
+ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8 \ No newline at end of file
diff --git a/bootstrap/generated-dists/debian10/bootstrap.sh b/bootstrap/generated-dists/debian10/bootstrap.sh
new file mode 100755
index 00000000000..6970c477b38
--- /dev/null
+++ b/bootstrap/generated-dists/debian10/bootstrap.sh
@@ -0,0 +1,106 @@
+#!/bin/bash
+
+#
+# This file is generated by 'bootstrap/template.py --render'
+# See also bootstrap/config.py
+#
+
+set -xueo pipefail
+
+export DEBIAN_FRONTEND=noninteractive
+apt-get -y update
+
+apt-get -y install \
+ acl \
+ apt-utils \
+ attr \
+ autoconf \
+ bind9utils \
+ binutils \
+ bison \
+ build-essential \
+ curl \
+ debhelper \
+ dnsutils \
+ docbook-xml \
+ docbook-xsl \
+ flex \
+ gcc \
+ gdb \
+ git \
+ glusterfs-common \
+ gzip \
+ heimdal-multidev \
+ hostname \
+ htop \
+ krb5-config \
+ krb5-kdc \
+ krb5-user \
+ lcov \
+ libacl1-dev \
+ libaio-dev \
+ libarchive-dev \
+ libattr1-dev \
+ libavahi-common-dev \
+ libblkid-dev \
+ libbsd-dev \
+ libcap-dev \
+ libcephfs-dev \
+ libcups2-dev \
+ libdbus-1-dev \
+ libglib2.0-dev \
+ libgnutls28-dev \
+ libgpgme11-dev \
+ libicu-dev \
+ libjansson-dev \
+ libjs-jquery \
+ libjson-perl \
+ libkrb5-dev \
+ libldap2-dev \
+ liblmdb-dev \
+ libncurses5-dev \
+ libpam0g-dev \
+ libparse-yapp-perl \
+ libpcap-dev \
+ libpopt-dev \
+ libreadline-dev \
+ libsystemd-dev \
+ libtasn1-bin \
+ libtasn1-dev \
+ libunwind-dev \
+ lmdb-utils \
+ locales \
+ lsb-release \
+ make \
+ mawk \
+ mingw-w64 \
+ patch \
+ perl \
+ perl-modules \
+ pkg-config \
+ procps \
+ psmisc \
+ python3 \
+ python3-crypto \
+ python3-dbg \
+ python3-dev \
+ python3-dnspython \
+ python3-gpg \
+ python3-iso8601 \
+ python3-markdown \
+ python3-matplotlib \
+ python3-pexpect \
+ rng-tools \
+ rsync \
+ sed \
+ sudo \
+ tar \
+ tree \
+ uuid-dev \
+ xfslibs-dev \
+ xsltproc \
+ zlib1g-dev
+
+apt-get -y autoremove
+apt-get -y autoclean
+apt-get -y clean \ No newline at end of file
diff --git a/bootstrap/generated-dists/debian10/locale.sh b/bootstrap/generated-dists/debian10/locale.sh
new file mode 100755
index 00000000000..cc64e180483
--- /dev/null
+++ b/bootstrap/generated-dists/debian10/locale.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+#
+# This file is generated by 'bootstrap/template.py --render'
+# See also bootstrap/config.py
+#
+
+set -xueo pipefail
+
+# refer to /usr/share/i18n/locales
+INPUTFILE=en_US
+# refer to /usr/share/i18n/charmaps
+CHARMAP=UTF-8
+# locale to generate in /usr/lib/locale
+# glibc/localedef will normalize UTF-8 to utf8, follow the naming style
+LOCALE=$INPUTFILE.utf8
+
+# if locale is already correct, exit
+( locale | grep LC_ALL | grep -i $LOCALE ) && exit 0
+
+# if locale not available, generate locale into /usr/lib/locale
+if ! ( locale --all-locales | grep -i $LOCALE )
+then
+ # no-archive means create its own dir
+ localedef --inputfile $INPUTFILE --charmap $CHARMAP --no-archive $LOCALE
+fi
+
+# update locale conf and global env file
+# set both LC_ALL and LANG for safe
+
+# update conf for Debian family
+FILE=/etc/default/locale
+if [ -f $FILE ]
+then
+ echo LC_ALL="$LOCALE" > $FILE
+ echo LANG="$LOCALE" >> $FILE
+fi
+
+# update conf for RedHat family
+FILE=/etc/locale.conf
+if [ -f $FILE ]
+then
+ # LC_ALL is not valid in this file, set LANG only
+ echo LANG="$LOCALE" > $FILE
+fi
+
+# update global env file
+FILE=/etc/environment
+if [ -f $FILE ]
+then
+ # append LC_ALL if not exist
+ grep LC_ALL $FILE || echo LC_ALL="$LOCALE" >> $FILE
+ # append LANG if not exist
+ grep LANG $FILE || echo LANG="$LOCALE" >> $FILE
+fi \ No newline at end of file
diff --git a/bootstrap/generated-dists/debian10/packages.yml b/bootstrap/generated-dists/debian10/packages.yml
new file mode 100644
index 00000000000..5943f28704b
--- /dev/null
+++ b/bootstrap/generated-dists/debian10/packages.yml
@@ -0,0 +1,91 @@
+---
+packages:
+ - acl
+ - apt-utils
+ - attr
+ - autoconf
+ - bind9utils
+ - binutils
+ - bison
+ - build-essential
+ - curl
+ - debhelper
+ - dnsutils
+ - docbook-xml
+ - docbook-xsl
+ - flex
+ - gcc
+ - gdb
+ - git
+ - glusterfs-common
+ - gzip
+ - heimdal-multidev
+ - hostname
+ - htop
+ - krb5-config
+ - krb5-kdc
+ - krb5-user
+ - lcov
+ - libacl1-dev
+ - libaio-dev
+ - libarchive-dev
+ - libattr1-dev
+ - libavahi-common-dev
+ - libblkid-dev
+ - libbsd-dev
+ - libcap-dev
+ - libcephfs-dev
+ - libcups2-dev
+ - libdbus-1-dev
+ - libglib2.0-dev
+ - libgnutls28-dev
+ - libgpgme11-dev
+ - libicu-dev
+ - libjansson-dev
+ - libjs-jquery
+ - libjson-perl
+ - libkrb5-dev
+ - libldap2-dev
+ - liblmdb-dev
+ - libncurses5-dev
+ - libpam0g-dev
+ - libparse-yapp-perl
+ - libpcap-dev
+ - libpopt-dev
+ - libreadline-dev
+ - libsystemd-dev
+ - libtasn1-bin
+ - libtasn1-dev
+ - libunwind-dev
+ - lmdb-utils
+ - locales
+ - lsb-release
+ - make
+ - mawk
+ - mingw-w64
+ - patch
+ - perl
+ - perl-modules
+ - pkg-config
+ - procps
+ - psmisc
+ - python3
+ - python3-crypto
+ - python3-dbg
+ - python3-dev
+ - python3-dnspython
+ - python3-gpg
+ - python3-iso8601
+ - python3-markdown
+ - python3-matplotlib
+ - python3-pexpect
+ - rng-tools
+ - rsync
+ - sed
+ - sudo
+ - tar
+ - tree
+ - uuid-dev
+ - xfslibs-dev
+ - xsltproc
+ - zlib1g-dev \ No newline at end of file
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index cb067706974..8117f01d9b4 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-8a3bbedea9514a337ed39d8c4e88abb17c43f975
+f0cc64e22c612eb0599984cfc5dd20f36858db59