The branch, master has been updated
via ebb62bcbf4b bootstrap: Use slim images for Debian
via 91ae8f5ebd5 bootstrap: Use minimal image for Fedora
via 7cef1e3c024 bootstrap: Remove unused ubuntu1804 images
from f636bd3ec08 s3:script: Avoid UnicodeDecodeError for
samba-log-parser processing whole directory
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit ebb62bcbf4b2d65cd1f1b27d349a4f1bcee13ca0
Author: Andreas Schneider <[email protected]>
Date: Fri Aug 8 09:57:59 2025 +0200
bootstrap: Use slim images for Debian
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Martin Schwenke <[email protected]>
Autobuild-User(master): Martin Schwenke <[email protected]>
Autobuild-Date(master): Wed Sep 10 03:13:07 UTC 2025 on atb-devel-224
commit 91ae8f5ebd5512a29d2e8a21186b01b2dbb02c99
Author: Andreas Schneider <[email protected]>
Date: Fri Aug 8 09:50:05 2025 +0200
bootstrap: Use minimal image for Fedora
This will reduce the container image size.
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Martin Schwenke <[email protected]>
commit 7cef1e3c024db78d1b9c512f454a3dd4c7391caf
Author: Andreas Schneider <[email protected]>
Date: Fri Aug 8 10:05:10 2025 +0200
bootstrap: Remove unused ubuntu1804 images
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Martin Schwenke <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci-main.yml | 2 +-
bootstrap/README.md | 6 +-
bootstrap/config.py | 32 +-----
bootstrap/generated-dists/Vagrantfile | 14 ---
.../generated-dists/debian11-32bit/Dockerfile | 2 +-
bootstrap/generated-dists/debian11/Dockerfile | 2 +-
.../generated-dists/debian12-32bit/Dockerfile | 2 +-
bootstrap/generated-dists/debian12/Dockerfile | 2 +-
bootstrap/generated-dists/fedora42/Dockerfile | 2 +-
.../generated-dists/ubuntu1804-32bit/Dockerfile | 29 -----
.../generated-dists/ubuntu1804-32bit/bootstrap.sh | 121 ---------------------
.../generated-dists/ubuntu1804-32bit/locale.sh | 55 ----------
.../generated-dists/ubuntu1804-32bit/packages.yml | 106 ------------------
bootstrap/generated-dists/ubuntu1804/Dockerfile | 29 -----
bootstrap/generated-dists/ubuntu1804/bootstrap.sh | 121 ---------------------
bootstrap/generated-dists/ubuntu1804/locale.sh | 55 ----------
bootstrap/generated-dists/ubuntu1804/packages.yml | 106 ------------------
bootstrap/sha1sum.txt | 2 +-
18 files changed, 16 insertions(+), 672 deletions(-)
delete mode 100644 bootstrap/generated-dists/ubuntu1804-32bit/Dockerfile
delete mode 100755 bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh
delete mode 100755 bootstrap/generated-dists/ubuntu1804-32bit/locale.sh
delete mode 100644 bootstrap/generated-dists/ubuntu1804-32bit/packages.yml
delete mode 100644 bootstrap/generated-dists/ubuntu1804/Dockerfile
delete mode 100755 bootstrap/generated-dists/ubuntu1804/bootstrap.sh
delete mode 100755 bootstrap/generated-dists/ubuntu1804/locale.sh
delete mode 100644 bootstrap/generated-dists/ubuntu1804/packages.yml
Changeset truncated at 500 lines:
diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index 49e1e1792e8..b6ba6fab20f 100644
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -47,7 +47,7 @@ variables:
# Set this to the contents of bootstrap/sha1sum.txt
# which is generated by bootstrap/template.py --render
#
- SAMBA_CI_CONTAINER_TAG: 3dc161f073e0f8ab1c8d5d59fef9e5e33630b51e
+ SAMBA_CI_CONTAINER_TAG: c881e62a14fbabdf014bb3653fffcff5a13e71cc
#
# We use the ubuntu2204 image as default as
# it matches what we have on atb-devel-224
diff --git a/bootstrap/README.md b/bootstrap/README.md
index 6b3de983728..c5192d37332 100644
--- a/bootstrap/README.md
+++ b/bootstrap/README.md
@@ -84,12 +84,12 @@ With Docker:
cd ~/samba
git clean -xdf
docker login
- docker pull
registry.gitlab.com/samba-team/devel/samba/samba-ci-ubuntu1804:${sha1sum}
- docker run -it -v $(pwd):/home/samba/samba samba-ci-ubuntu1804:${sha1sum} bash
+ docker pull
registry.gitlab.com/samba-team/devel/samba/samba-ci-ubuntu2404:${sha1sum}
+ docker run -it -v $(pwd):/home/samba/samba samba-ci-ubuntu2404:${sha1sum} bash
With podman:
- podman run -ti --cap-add=SYS_PTRACE --security-opt seccomp=unconfined
registry.gitlab.com/samba-team/devel/samba/samba-ci-ubuntu1804:${sha1sum} bash
+ podman run -ti --cap-add=SYS_PTRACE --security-opt seccomp=unconfined
registry.gitlab.com/samba-team/devel/samba/samba-ci-ubuntu2404:${sha1sum} bash
With Vagrant:
diff --git a/bootstrap/config.py b/bootstrap/config.py
index 08c12dd1793..3ef975c943f 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -453,7 +453,7 @@ end
DEB_DISTS = {
'debian11': {
- 'docker_image': 'debian:11',
+ 'docker_image': 'debian:11-slim',
'vagrant_box': 'debian/bullseye64',
'replace': {
'language-pack-en': '', # included in locales
@@ -464,7 +464,7 @@ DEB_DISTS = {
}
},
'debian11-32bit': {
- 'docker_image': 'debian:11', # specify the platform in .gitlab-ci.yaml
+ 'docker_image': 'debian:11-slim', # specify the platform in
.gitlab-ci.yaml
'vagrant_box': 'debian/bullseye32',
'replace': {
'language-pack-en': '', # included in locales
@@ -475,7 +475,7 @@ DEB_DISTS = {
}
},
'debian12': {
- 'docker_image': 'debian:12',
+ 'docker_image': 'debian:12-slim',
'vagrant_box': 'debian/bookworm64',
'replace': {
'language-pack-en': '', # included in locales
@@ -485,7 +485,7 @@ DEB_DISTS = {
}
},
'debian12-32bit': {
- 'docker_image': 'registry-1.docker.io/i386/debian:12',
+ 'docker_image': 'registry-1.docker.io/i386/debian:12-slim',
'vagrant_box': 'debian/bookworm32',
'replace': {
'language-pack-en': '', # included in locales
@@ -494,26 +494,6 @@ DEB_DISTS = {
'landscape-common': '',
}
},
- 'ubuntu1804': {
- 'docker_image': 'ubuntu:18.04',
- 'vagrant_box': 'ubuntu/bionic64',
- 'replace': {
- 'liburing-dev': '', # not available
- 'shfmt': '',
- 'landscape-common': '',
- 'mold': '',
- }
- },
- 'ubuntu1804-32bit': {
- 'docker_image': 'registry-1.docker.io/i386/ubuntu:18.04',
- 'vagrant_box': 'ubuntu/bionic32',
- 'replace': {
- 'liburing-dev': '', # not available
- 'shfmt': '',
- 'landscape-common': '',
- 'mold': '',
- }
- },
'ubuntu2004': {
'docker_image': 'ubuntu:20.04',
'vagrant_box': 'ubuntu/focal64',
@@ -582,7 +562,7 @@ RPM_DISTS = {
}
},
'fedora42': {
- 'docker_image': 'quay.io/fedora/fedora:42',
+ 'docker_image': 'quay.io/fedora/fedora-minimal:42',
'vagrant_box': 'fedora/42-cloud-base',
'bootstrap': DNF_BOOTSTRAP,
'replace': {
@@ -707,7 +687,7 @@ def render_vagrantfile(dists):
This make it easier to manage the fleet, e.g:
start all: vagrant up
- start one: vagrant up ubuntu1804
+ start one: vagrant up ubuntu2404
All other commands apply to above syntax, e.g.: status, destroy, provision
"""
diff --git a/bootstrap/generated-dists/Vagrantfile
b/bootstrap/generated-dists/Vagrantfile
index 74993c9c58a..511c670a798 100644
--- a/bootstrap/generated-dists/Vagrantfile
+++ b/bootstrap/generated-dists/Vagrantfile
@@ -66,20 +66,6 @@ Vagrant.configure("2") do |config|
v.vm.provision :shell, path: "rocky8/locale.sh"
end
- config.vm.define "ubuntu1804" do |v|
- v.vm.box = "ubuntu/bionic64"
- v.vm.hostname = "ubuntu1804"
- v.vm.provision :shell, path: "ubuntu1804/bootstrap.sh"
- v.vm.provision :shell, path: "ubuntu1804/locale.sh"
- end
-
- config.vm.define "ubuntu1804-32bit" do |v|
- v.vm.box = "ubuntu/bionic32"
- v.vm.hostname = "ubuntu1804-32bit"
- v.vm.provision :shell, path: "ubuntu1804-32bit/bootstrap.sh"
- v.vm.provision :shell, path: "ubuntu1804-32bit/locale.sh"
- end
-
config.vm.define "ubuntu2004" do |v|
v.vm.box = "ubuntu/focal64"
v.vm.hostname = "ubuntu2004"
diff --git a/bootstrap/generated-dists/debian11-32bit/Dockerfile
b/bootstrap/generated-dists/debian11-32bit/Dockerfile
index 90a961f5345..09123a1ef86 100644
--- a/bootstrap/generated-dists/debian11-32bit/Dockerfile
+++ b/bootstrap/generated-dists/debian11-32bit/Dockerfile
@@ -3,7 +3,7 @@
# See also bootstrap/config.py
#
-FROM debian:11
+FROM debian:11-slim
# pass in with --build-arg while build
ARG SHA1SUM
diff --git a/bootstrap/generated-dists/debian11/Dockerfile
b/bootstrap/generated-dists/debian11/Dockerfile
index 90a961f5345..09123a1ef86 100644
--- a/bootstrap/generated-dists/debian11/Dockerfile
+++ b/bootstrap/generated-dists/debian11/Dockerfile
@@ -3,7 +3,7 @@
# See also bootstrap/config.py
#
-FROM debian:11
+FROM debian:11-slim
# pass in with --build-arg while build
ARG SHA1SUM
diff --git a/bootstrap/generated-dists/debian12-32bit/Dockerfile
b/bootstrap/generated-dists/debian12-32bit/Dockerfile
index fc72e143624..7b6be71269f 100644
--- a/bootstrap/generated-dists/debian12-32bit/Dockerfile
+++ b/bootstrap/generated-dists/debian12-32bit/Dockerfile
@@ -3,7 +3,7 @@
# See also bootstrap/config.py
#
-FROM registry-1.docker.io/i386/debian:12
+FROM registry-1.docker.io/i386/debian:12-slim
# pass in with --build-arg while build
ARG SHA1SUM
diff --git a/bootstrap/generated-dists/debian12/Dockerfile
b/bootstrap/generated-dists/debian12/Dockerfile
index 2b0e1401c73..1794e51d43d 100644
--- a/bootstrap/generated-dists/debian12/Dockerfile
+++ b/bootstrap/generated-dists/debian12/Dockerfile
@@ -3,7 +3,7 @@
# See also bootstrap/config.py
#
-FROM debian:12
+FROM debian:12-slim
# pass in with --build-arg while build
ARG SHA1SUM
diff --git a/bootstrap/generated-dists/fedora42/Dockerfile
b/bootstrap/generated-dists/fedora42/Dockerfile
index 5f063cdc27c..18a07776186 100644
--- a/bootstrap/generated-dists/fedora42/Dockerfile
+++ b/bootstrap/generated-dists/fedora42/Dockerfile
@@ -3,7 +3,7 @@
# See also bootstrap/config.py
#
-FROM quay.io/fedora/fedora:42
+FROM quay.io/fedora/fedora-minimal:42
# pass in with --build-arg while build
ARG SHA1SUM
diff --git a/bootstrap/generated-dists/ubuntu1804-32bit/Dockerfile
b/bootstrap/generated-dists/ubuntu1804-32bit/Dockerfile
deleted file mode 100644
index 4feffbd3d8f..00000000000
--- a/bootstrap/generated-dists/ubuntu1804-32bit/Dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# This file is generated by 'bootstrap/template.py --render'
-# See also bootstrap/config.py
-#
-
-FROM registry-1.docker.io/i386/ubuntu:18.04
-
-# 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_GOLD=$(which ld.gold) || { LD=$(which ld) && ln -sf $LD_GOLD
$LD && test -x $LD && echo "$LD is now $LD_GOLD"; }
-# if ld.mold exists, force link it to ld (prefer mold over gold! ;-)
-RUN set -x; ! LD_MOLD=$(which ld.mold) || { LD=$(which ld) && ln -sf $LD_MOLD
$LD && test -x $LD && echo "$LD is now $LD_MOLD"; }
-
-# 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 LANGUAGE=en_US
\ No newline at end of file
diff --git a/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh
b/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh
deleted file mode 100755
index ac716b38593..00000000000
--- a/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/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 \
- cargo \
- ccache \
- chrpath \
- codespell \
- curl \
- debhelper \
- dnsutils \
- docbook-xml \
- docbook-xsl \
- flex \
- gcc \
- gdb \
- git \
- glusterfs-common \
- gnutls-bin \
- gzip \
- heimdal-multidev \
- hostname \
- htop \
- jq \
- krb5-config \
- krb5-kdc \
- krb5-user \
- language-pack-en \
- lcov \
- libacl1-dev \
- libarchive-dev \
- libattr1-dev \
- libavahi-common-dev \
- libblkid-dev \
- libbsd-dev \
- libcap-dev \
- libcephfs-dev \
- libclang-dev \
- libcups2-dev \
- libdbus-1-dev \
- libevent-dev \
- libglib2.0-dev \
- libgnutls28-dev \
- libgpgme11-dev \
- libicu-dev \
- libjansson-dev \
- libjs-jquery \
- libkeyutils-dev \
- libkrb5-dev \
- libldap2-dev \
- liblmdb-dev \
- libncurses5-dev \
- libpam0g-dev \
- libparse-yapp-perl \
- libpcap-dev \
- libpopt-dev \
- libreadline-dev \
- libssl-dev \
- libsystemd-dev \
- libtasn1-bin \
- libtasn1-dev \
- libtracker-sparql-2.0-dev \
- libunwind-dev \
- libutf8proc-dev \
- lmdb-utils \
- locales \
- lsb-release \
- make \
- mawk \
- mingw-w64 \
- patch \
- perl \
- perl-modules \
- pkg-config \
- procps \
- psmisc \
- python3 \
- python3-cryptography \
- python3-dbg \
- python3-dev \
- python3-dnspython \
- python3-gpg \
- python3-iso8601 \
- python3-markdown \
- python3-pyasn1 \
- python3-requests \
- python3-setproctitle \
- rng-tools \
- rsync \
- sed \
- shellcheck \
- sudo \
- tar \
- tree \
- uuid-dev \
- wget \
- xfslibs-dev \
- xsltproc \
- xz-utils \
- 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/ubuntu1804-32bit/locale.sh
b/bootstrap/generated-dists/ubuntu1804-32bit/locale.sh
deleted file mode 100755
index cc64e180483..00000000000
--- a/bootstrap/generated-dists/ubuntu1804-32bit/locale.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/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/ubuntu1804-32bit/packages.yml
b/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml
deleted file mode 100644
index eb8e7ad4053..00000000000
--- a/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml
+++ /dev/null
@@ -1,106 +0,0 @@
----
-packages:
- - acl
- - apt-utils
- - attr
- - autoconf
- - bind9utils
- - binutils
- - bison
- - build-essential
- - cargo
- - ccache
- - chrpath
- - codespell
- - curl
- - debhelper
- - dnsutils
- - docbook-xml
- - docbook-xsl
- - flex
- - gcc
- - gdb
- - git
- - glusterfs-common
- - gnutls-bin
- - gzip
- - heimdal-multidev
- - hostname
- - htop
- - jq
- - krb5-config
- - krb5-kdc
- - krb5-user
- - language-pack-en
- - lcov
- - libacl1-dev
- - libarchive-dev
- - libattr1-dev
- - libavahi-common-dev
- - libblkid-dev
- - libbsd-dev
- - libcap-dev
- - libcephfs-dev
- - libclang-dev
- - libcups2-dev
- - libdbus-1-dev
- - libevent-dev
- - libglib2.0-dev
- - libgnutls28-dev
- - libgpgme11-dev
- - libicu-dev
- - libjansson-dev
- - libjs-jquery
- - libkeyutils-dev
- - libkrb5-dev
- - libldap2-dev
- - liblmdb-dev
- - libncurses5-dev
- - libpam0g-dev
- - libparse-yapp-perl
--
Samba Shared Repository
