From: Andreas Schneider <asn@samba.org>
Date: Mon, 7 Oct 2019 11:28:07 +0000 (+0200)
Subject: bootstrap: We can only build docker images on gitlab shared runners
X-Git-Tag: talloc-2.3.1~470
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9cd0d15370142b3694a51fa9b6cfffdb8e08e886;p=thirdparty%2Fsamba.git

bootstrap: We can only build docker images on gitlab shared runners

Our rackspace runners don't provide a running docker.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 77b7406f4a6..101c509a5ae 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: 8cfc53988524dd9a32ed64bfdfcd623631cc8398
+  SAMBA_CI_CONTAINER_TAG: b2e8ad4e8057ddc87386ef5ac7cd8599f04d7a57
   #
   # We use the ubuntu1804 image as default as
   # it matches what we have on sn-devel-184.
diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml
index 8254986d2dc..9f29e7f69db 100644
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -6,6 +6,7 @@ services:
   stage: images
   tags:
     - docker
+    - shared
   variables:
     SAMBA_CI_IS_BROKEN_IMAGE: "no"
   before_script:
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index 09b0d25ece3..39995d695d3 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-8cfc53988524dd9a32ed64bfdfcd623631cc8398
+b2e8ad4e8057ddc87386ef5ac7cd8599f04d7a57