summaryrefslogtreecommitdiff
path: root/bootstrap
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2019-04-30 14:12:55 +0200
committerAndreas Schneider <asn@cryptomilk.org>2019-04-30 18:48:18 +0000
commit4dd8db321f19c06db3f7e4eec43cc44c1cc68716 (patch)
tree76940b1da9095c38db4eb0ba898acf713b31632d /bootstrap
parente48a6c846f40d83187beb8ed5c36bc2f75baaef2 (diff)
downloadsamba-4dd8db321f19c06db3f7e4eec43cc44c1cc68716.tar.gz
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
Diffstat (limited to 'bootstrap')
-rwxr-xr-xbootstrap/generated-dists/fedora28/bootstrap.sh1
-rwxr-xr-xbootstrap/generated-dists/fedora29/bootstrap.sh1
-rwxr-xr-xbootstrap/generated-dists/opensuse150/bootstrap.sh5
-rw-r--r--bootstrap/sha1sum.txt2
4 files changed, 6 insertions, 3 deletions
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