bootstrap: Use quay.io to download fedora images

The docker registry is rate limited now. This often leads to errors, so
use the Red Hat registry.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Sun Jun 26 23:08:03 UTC 2022 on sn-devel-184

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index 2974212e888ed5867505ff4eebc3266e038c6e74..ce30e044335515270d2ad5661675b6302c269502 100644 (file)
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -47,7 +47,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: f0d5c414802246c0df46f9bbbceeda4853fd24b7
+  SAMBA_CI_CONTAINER_TAG: b62662cd85b10ca4767b9ead4e9b0482ad98ddb2
   #
   # We use the ubuntu1804 image as default as
   # it matches what we have on sn-devel-184.

diff --git a/bootstrap/config.py b/bootstrap/config.py
index a204d1e19c3379bd714926d323db3f5b872c038d..a00b253ae777505e93971e1fcc217963cbfd9344 100644 (file)
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -490,7 +490,7 @@ RPM_DISTS = {
         }
     },
     'fedora36': {
-        'docker_image': 'fedora:36',
+        'docker_image': 'quay.io/fedora/fedora:36',
         'vagrant_box': 'fedora/36-cloud-base',
         'bootstrap': DNF_BOOTSTRAP,
         'replace': {
@@ -501,7 +501,7 @@ RPM_DISTS = {
         }
     },
     'f36mit120': {
-        'docker_image': 'fedora:36',
+        'docker_image': 'quay.io/fedora/fedora:36',
         'vagrant_box': 'fedora/36-cloud-base',
         'bootstrap': DNF_BOOTSTRAP_MIT,
         'replace': {

diff --git a/bootstrap/generated-dists/f36mit120/Dockerfile b/bootstrap/generated-dists/f36mit120/Dockerfile
index 803f0752a1108892eb90bec0bab3c400940f7af3..8ceb585b6fdcb1f5d4055ac658c9f7a792128f1d 100644 (file)
--- a/bootstrap/generated-dists/f36mit120/Dockerfile
+++ b/bootstrap/generated-dists/f36mit120/Dockerfile
@@ -3,7 +3,7 @@
 # See also bootstrap/config.py
 #
 
-FROM fedora:36
+FROM quay.io/fedora/fedora:36
 
 # pass in with --build-arg while build
 ARG SHA1SUM

diff --git a/bootstrap/generated-dists/fedora36/Dockerfile b/bootstrap/generated-dists/fedora36/Dockerfile
index 803f0752a1108892eb90bec0bab3c400940f7af3..8ceb585b6fdcb1f5d4055ac658c9f7a792128f1d 100644 (file)
--- a/bootstrap/generated-dists/fedora36/Dockerfile
+++ b/bootstrap/generated-dists/fedora36/Dockerfile
@@ -3,7 +3,7 @@
 # See also bootstrap/config.py
 #
 
-FROM fedora:36
+FROM quay.io/fedora/fedora:36
 
 # pass in with --build-arg while build
 ARG SHA1SUM

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index ac500bec4f2300090069f271a23d4ddc4c91f1d7..d9766fd37b911a6ad95e6afc4d1504dcdb89c0ab 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-f0d5c414802246c0df46f9bbbceeda4853fd24b7
+b62662cd85b10ca4767b9ead4e9b0482ad98ddb2