From ccf5c5eace414db43f32ec1faafdc54025b1b328 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
Date: Tue, 27 Jul 2021 16:50:29 +0100
Subject: [PATCH] ci: refresh centos-stream container
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It is no longer possible to just install an extra package to run regular
centos into centos stream.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 ci/containers/ci-centos-stream.Dockerfile | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/ci/containers/ci-centos-stream.Dockerfile b/ci/containers/ci-centos-stream.Dockerfile
index 2614b18..8aa40cd 100644
--- a/ci/containers/ci-centos-stream.Dockerfile
+++ b/ci/containers/ci-centos-stream.Dockerfile
@@ -1,20 +1,21 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile centos-stream libvirt+minimal,libvirt-glib,gtk-vnc,virt-viewer
+#  $ lcitool dockerfile centos-stream-8 libvirt+minimal,libvirt-glib,gtk-vnc,virt-viewer
 #
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/318adcadcf442daba1883f5046ad1970b65e5ca0
-FROM docker.io/library/centos:8
+# https://gitlab.com/libvirt/libvirt-ci/-/commit/6cd723b4affb2ee67e7d462dac480191c4b97598
+
+FROM quay.io/centos/centos:stream8
 
 RUN dnf update -y && \
-    dnf install -y centos-release-stream && \
     dnf install 'dnf-command(config-manager)' -y && \
-    dnf config-manager --set-enabled -y Stream-PowerTools && \
+    dnf config-manager --set-enabled -y powertools && \
     dnf install -y centos-release-advanced-virtualization && \
     dnf install -y epel-release && \
     dnf install -y \
         bash-completion \
         ca-certificates \
         ccache \
+        cpp \
         cyrus-sasl-devel \
         gcc \
         gdk-pixbuf2-devel \
@@ -56,10 +57,10 @@ RUN dnf update -y && \
     rpm -qa | sort > /packages.txt && \
     mkdir -p /usr/libexec/ccache-wrappers && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc)
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
 
 RUN pip3 install \
-         meson==0.54.0
+         meson==0.56.0
 
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"