From: Andreas Schneider <asn@samba.org>
Date: Tue, 30 Apr 2019 12:12:55 +0000 (+0200)
Subject: gitlab-ci: Update for building new containers
X-Git-Tag: samba-4.11.0rc1~1166
X-Git-Url: http://git.samba.org/?p=metze%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=4dd8db321f19c06db3f7e4eec43cc44c1cc68716

gitlab-ci: Update for building new containers

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Tue Apr 30 18:48:18 UTC 2019 on sn-devel-184
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 01ef8e0e6b9..86fd2fb2778 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: a63fcd17331238531d472206e34aa24c9fc46bb1
+  SAMBA_CI_CONTAINER_TAG: 4cc4709edd40e4e7c64f9eb255f953eed7924b1f
   #
   # The following images are available
   # Please see the samba-o3 sections at the end of this file!
diff --git a/bootstrap/generated-dists/fedora28/bootstrap.sh b/bootstrap/generated-dists/fedora28/bootstrap.sh
index aa9d64c492a..274459257ed 100755
--- a/bootstrap/generated-dists/fedora28/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora28/bootstrap.sh
@@ -10,6 +10,7 @@ set -xueo pipefail
 dnf update -y
 
 dnf install -y \
+    --setopt=install_weak_deps=False \
     @development-tools \
     acl \
     attr \
diff --git a/bootstrap/generated-dists/fedora29/bootstrap.sh b/bootstrap/generated-dists/fedora29/bootstrap.sh
index aa9d64c492a..274459257ed 100755
--- a/bootstrap/generated-dists/fedora29/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora29/bootstrap.sh
@@ -10,6 +10,7 @@ set -xueo pipefail
 dnf update -y
 
 dnf install -y \
+    --setopt=install_weak_deps=False \
     @development-tools \
     acl \
     attr \
diff --git a/bootstrap/generated-dists/opensuse150/bootstrap.sh b/bootstrap/generated-dists/opensuse150/bootstrap.sh
index 0d79288ef3f..4f42c526375 100755
--- a/bootstrap/generated-dists/opensuse150/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse150/bootstrap.sh
@@ -10,6 +10,8 @@ set -xueo pipefail
 zypper --non-interactive refresh
 zypper --non-interactive update
 zypper --non-interactive install \
+    --no-recommends \
+    system-user-nobody \
     acl \
     attr \
     autoconf \
@@ -99,8 +101,7 @@ zypper --non-interactive install \
     which \
     xfsprogs-devel \
     yum-utils \
-    zlib-devel \
-    system-user-nobody
+    zlib-devel
 
 zypper --non-interactive clean
 
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index a522f0566a6..dca78add500 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-a63fcd17331238531d472206e34aa24c9fc46bb1
+4cc4709edd40e4e7c64f9eb255f953eed7924b1f