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 01ef8e0e6b91a0496af7ee5d8f78efff26b48af8..86fd2fb2778afe828404550b1795b5d83644aecf 100644 (file)
--- 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 aa9d64c492af84699d469b91b65b9c9552d49e16..274459257eda52c297636e3ebb1e7b0dc5824d7b 100755 (executable)
--- 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 aa9d64c492af84699d469b91b65b9c9552d49e16..274459257eda52c297636e3ebb1e7b0dc5824d7b 100755 (executable)
--- 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 0d79288ef3f02f20a818dcf95e0cbbe4c12cc7f4..4f42c52637575dedf1927baa83367da788e02e00 100755 (executable)
--- 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 a522f0566a60c5072c8eff292bcf647468f04502..dca78add5006326d1d2e3e31977d747b20984403 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-a63fcd17331238531d472206e34aa24c9fc46bb1
+4cc4709edd40e4e7c64f9eb255f953eed7924b1f