From: Andreas Schneider Date: Mon, 20 Jun 2022 16:48:56 +0000 (+0200) Subject: bootstrap: Use quay.io to download fedora images X-Git-Tag: tevent-0.13.0~311 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f06b40a91966c521cd7f4ce4afc4e2f76c00a045;p=thirdparty%2Fsamba.git 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 Reviewed-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett 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 2974212e888..ce30e044335 100644 --- 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 a204d1e19c3..a00b253ae77 100644 --- 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 803f0752a11..8ceb585b6fd 100644 --- 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 803f0752a11..8ceb585b6fd 100644 --- 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 ac500bec4f2..d9766fd37b9 100644 --- a/bootstrap/sha1sum.txt +++ b/bootstrap/sha1sum.txt @@ -1 +1 @@ -f0d5c414802246c0df46f9bbbceeda4853fd24b7 +b62662cd85b10ca4767b9ead4e9b0482ad98ddb2