From 82e03b79fc8bd12bd12416480ec0fc3e494fd267 Mon Sep 17 00:00:00 2001
From: Mikhail Klementev <root@dumpstack.io>
Date: Thu, 17 Oct 2024 21:17:24 +0000
Subject: [PATCH] fix(qemu images): add appstream repo for OracleLinux

---
 tools/qemu-oraclelinux-img/Dockerfile.template | 2 ++
 tools/qemu-oraclelinux-img/generate-images.sh  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/tools/qemu-oraclelinux-img/Dockerfile.template b/tools/qemu-oraclelinux-img/Dockerfile.template
index b4485ab..b5c69e0 100644
--- a/tools/qemu-oraclelinux-img/Dockerfile.template
+++ b/tools/qemu-oraclelinux-img/Dockerfile.template
@@ -13,6 +13,7 @@ RUN yum --installroot=$TMPDIR \
         --releasever=_VERSION_ \
         --disablerepo='*' \
         --enablerepo=ol_VERSION__baseos_latest \
+        --enablerepo=ol_VERSION__appstream \
         -y groupinstall Base
 
 RUN cp /etc/yum.repos.d/* $TMPDIR/etc/yum.repos.d/
@@ -21,6 +22,7 @@ RUN yum --installroot=$TMPDIR \
         --releasever=_VERSION_ \
         --disablerepo='*' \
         --enablerepo=ol_VERSION__baseos_latest \
+        --enablerepo=ol_VERSION__appstream \
         -y install openssh-server openssh-clients dhclient yum
 
 RUN chroot $TMPDIR /bin/sh -c 'useradd -m user'
diff --git a/tools/qemu-oraclelinux-img/generate-images.sh b/tools/qemu-oraclelinux-img/generate-images.sh
index 9cf71df..b78a587 100755
--- a/tools/qemu-oraclelinux-img/generate-images.sh
+++ b/tools/qemu-oraclelinux-img/generate-images.sh
@@ -11,9 +11,11 @@ for version in 6 7 8 9; do
 
     if [[ $version -eq 6 ]]; then
 	sed -i 's/baseos_latest/u10_base/' $version/Dockerfile
+	sed -i '/appstream/d' $version/Dockerfile
     fi
     if [[ $version -eq 7 ]]; then
 	sed -i 's/baseos_latest/u9_base/' $version/Dockerfile
+	sed -i '/appstream/d' $version/Dockerfile
     fi
 
     podman build -t gen-oraclelinux${version}-image $version