diff options
| author | Andreas Schneider <asn@samba.org> | 2019-10-07 13:28:07 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2019-10-08 07:10:41 +0000 |
| commit | 9cd0d15370142b3694a51fa9b6cfffdb8e08e886 (patch) | |
| tree | 9ff1034f28c507d3e60973d5f76948d0545123a6 | |
| parent | 42edab7bd76022dd4d5338012f29aed29a2a2d89 (diff) | |
| download | samba-9cd0d15370142b3694a51fa9b6cfffdb8e08e886.tar.gz | |
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>
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | bootstrap/.gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | bootstrap/sha1sum.txt | 2 |
3 files changed, 3 insertions, 2 deletions
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 |