From e160cd539146b66dc2e8d94cb1716556f480d37a Mon Sep 17 00:00:00 2001
From: Riccardo Pittau <elfosardo@gmail.com>
Date: Tue, 25 May 2021 16:28:05 +0200
Subject: [PATCH] Switch to Centos 8 Stream base image

---
 Dockerfile                | 4 ++--
 prepare-image.sh          | 2 +-
 resources/vbmc/Dockerfile | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e58c9bc9a..828465756 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 ## Build iPXE w/ IPv6 Support
 ## Note: we are pinning to a specific commit for reproducible builds.
 ## Updated as needed.
-FROM docker.io/centos:centos8 AS ironic-builder
+FROM quay.io/centos/centos:stream8 AS ironic-builder
 RUN dnf install -y gcc git make xz-devel
 WORKDIR /tmp
 COPY . .
@@ -29,7 +29,7 @@ RUN if [ $(uname -m) = "x86_64" ]; then \
       touch /tmp/esp.img; \
     fi
 
-FROM docker.io/centos:centos8
+FROM quay.io/centos/centos:stream8
 
 ENV PKGS_LIST=main-packages-list.txt
 ARG EXTRA_PKGS_LIST
diff --git a/prepare-image.sh b/prepare-image.sh
index 51acd36d3..750f99a4d 100755
--- a/prepare-image.sh
+++ b/prepare-image.sh
@@ -8,7 +8,7 @@ echo "tsflags=nodocs" >> /etc/dnf/dnf.conf
 
 dnf install -y python3 python3-requests epel-release 'dnf-command(config-manager)'
 dnf config-manager --set-disabled epel
-curl https://raw.githubusercontent.com/openstack/tripleo-repos/master/plugins/module_utils/tripleo_repos/main.py | python3 - -b master current-tripleo --no-stream
+curl https://raw.githubusercontent.com/openstack/tripleo-repos/master/plugins/module_utils/tripleo_repos/main.py | python3 - -b master current-tripleo
 dnf upgrade -y
 xargs -rtd'\n' dnf install -y < /tmp/${PKGS_LIST}
 if [[ ! -z ${EXTRA_PKGS_LIST:-} ]]; then
diff --git a/resources/vbmc/Dockerfile b/resources/vbmc/Dockerfile
index f2b477101..0e430c946 100644
--- a/resources/vbmc/Dockerfile
+++ b/resources/vbmc/Dockerfile
@@ -1,9 +1,9 @@
-ARG BASE_IMAGE=docker.io/centos:centos8
+ARG BASE_IMAGE=quay.io/centos/centos:stream8
 
 FROM $BASE_IMAGE
 
 RUN dnf install -y python3 python3-requests python3-pip && \
-     curl https://raw.githubusercontent.com/openstack/tripleo-repos/master/plugins/module_utils/tripleo_repos/main.py | python3 - -b master current-tripleo --no-stream && \
+     curl https://raw.githubusercontent.com/openstack/tripleo-repos/master/plugins/module_utils/tripleo_repos/main.py | python3 - -b master current-tripleo && \
      dnf upgrade -y && \
      dnf install -y python3-virtualbmc && \
      dnf clean all && \