From 5f0749155adf6b00714ae08cb5fe329b0174e880 Mon Sep 17 00:00:00 2001
From: Mikhail Klementev <blame@dumpstack.io>
Date: Thu, 11 May 2023 07:57:25 +0000
Subject: [PATCH] Fix CentOS 8 image generator

---
 tools/qemu-centos-img/8/Dockerfile  | 26 ++++++++------------------
 tools/qemu-centos-img/8/generate.sh |  3 +++
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/tools/qemu-centos-img/8/Dockerfile b/tools/qemu-centos-img/8/Dockerfile
index 2502864..cb2fde3 100644
--- a/tools/qemu-centos-img/8/Dockerfile
+++ b/tools/qemu-centos-img/8/Dockerfile
@@ -1,19 +1,9 @@
-# Copyright 2020 Mikhail Klementev. All rights reserved.
-# Use of this source code is governed by a AGPLv3 license
-# (or later) that can be found in the LICENSE file.
-#
-# Usage:
-#
-#     $ sudo docker build -t gen-centos8-image .
-#     $ sudo docker run --privileged -v $(pwd):/shared -t gen-centos8-image
-#     $ tar -Szcf out_of_tree_centos_8.img.tar.gz out_of_tree_centos_8.img
-#
-# out_of_tree_centos_8.img will be created in current directory.
-# You can change $(pwd) to different directory to use different destination
-# for image.
-#
 FROM centos:8
 
+RUN sed -i 's/enabled=1/enabled=0/' /etc/yum.repos.d/* || true
+RUN echo -e '[8.5.2111-os]\nbaseurl=https://vault.centos.org/8.5.2111/BaseOS/$basearch/os/\ngpgcheck=0' >> /etc/yum.repos.d/oot.repo
+RUN echo -e '[8.5.2111-appstream]\nbaseurl=https://vault.centos.org/8.5.2111/AppStream/$basearch/os/\ngpgcheck=0' >> /etc/yum.repos.d/oot.repo
+
 RUN yum -y update
 RUN yum -y groupinstall "Development Tools"
 RUN yum -y install qemu-img e2fsprogs
@@ -22,13 +12,13 @@ ENV TMPDIR=/tmp/centos
 
 RUN yum --installroot=$TMPDIR \
         --releasever=8 \
-        --disablerepo='*' \
-        --enablerepo=BaseOS \
         -y groupinstall Base
+
+RUN rm $TMPDIR/etc/yum.repos.d/*
+RUN cp /etc/yum.repos.d/* $TMPDIR/etc/yum.repos.d/
+
 RUN yum --installroot=$TMPDIR \
         --releasever=8 \
-        --disablerepo='*' \
-        --enablerepo=BaseOS \
         -y install openssh-server openssh-clients
 
 RUN chroot $TMPDIR /bin/sh -c 'useradd -m user'
diff --git a/tools/qemu-centos-img/8/generate.sh b/tools/qemu-centos-img/8/generate.sh
index 0ab64e4..654310b 100755
--- a/tools/qemu-centos-img/8/generate.sh
+++ b/tools/qemu-centos-img/8/generate.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
+
+set -eux
+
 cd "$(dirname "$0")"
 
 sudo docker build -t gen-centos8-image .