From 2680228afe6db208925382660cb3622c1aa3bdf3 Mon Sep 17 00:00:00 2001
From: "Aleksandar N. Kostadinov" <akostadi@redhat.com>
Date: Thu, 19 Dec 2024 22:30:35 +0200
Subject: [PATCH] use centos to build and ubi runtime

---
 Containerfile                          | 14 ++++--------
 centos_repo/RPM-GPG-KEY-centosofficial | 30 --------------------------
 centos_repo/centos-appstream.repo      |  9 --------
 centos_repo/vars/stream                |  1 -
 4 files changed, 4 insertions(+), 50 deletions(-)
 delete mode 100644 centos_repo/RPM-GPG-KEY-centosofficial
 delete mode 100644 centos_repo/centos-appstream.repo
 delete mode 100644 centos_repo/vars/stream

diff --git a/Containerfile b/Containerfile
index 36613e6..03554e4 100644
--- a/Containerfile
+++ b/Containerfile
@@ -15,15 +15,7 @@ WORKDIR $BUILD_PATH
 SHELL ["/bin/bash", "-x", "-o", "pipefail", "-c"]
 # to use clang, adjust CC and CXX variables and dependencies
 # hadolint ignore=DL3040
-RUN dnf install -y --setopt=strict=True --setopt=tsflags=nodocs mysql cmake $DEPS_GCC_UBI9 openssl-devel zlib-devel libicu-devel systemd-units rpm-build git xz gcc-c++
-
-# install non-ubi deps form centos
-COPY centos_repo/RPM-GPG-KEY-centosofficial /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
-COPY centos_repo/centos-appstream.repo /etc/yum.repos.d/
-COPY centos_repo/vars/stream /etc/yum/vars/
-COPY centos_repo/vars/stream /etc/dnf/vars/
-# hadolint ignore=DL3040
-RUN dnf install -y --setopt=strict=True --setopt=tsflags=nodocs $DEPS_NON_UBI
+RUN dnf install -y --setopt=strict=True --setopt=tsflags=nodocs mysql cmake $DEPS_GCC_UBI9 $DEPS_NON_UBI openssl-devel zlib-devel libicu-devel systemd-units rpm-build git xz gcc-c++
 
 # RUN curl -sSL https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.6/llvm-project-16.0.6.src.tar.xz -o llvm-project-16.0.6.src.tar.xz && \
 #    tar xvfJ llvm-project-16.0.6.src.tar.xz && \
@@ -49,7 +41,9 @@ WORKDIR /var/adm
 USER adm
 RUN rpmbuild -bb rpmbuild/SPECS/manticore-tzdata.spec
 
-FROM quay.io/centos/centos:stream9-minimal
+# it is ok not to tag ubi image as it is stable enough
+# hadolint ignore=DL3006
+FROM registry.access.redhat.com/ubi9-minimal
 
 LABEL org.opencontainers.image.authors="https://issues.redhat.com/browse/THREESCALE" \
       org.opencontainers.image.title="3scale searchd" \
diff --git a/centos_repo/RPM-GPG-KEY-centosofficial b/centos_repo/RPM-GPG-KEY-centosofficial
deleted file mode 100644
index 30235a8..0000000
--- a/centos_repo/RPM-GPG-KEY-centosofficial
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-mQINBFzMWxkBEADHrskpBgN9OphmhRkc7P/YrsAGSvvl7kfu+e9KAaU6f5MeAVyn
-rIoM43syyGkgFyWgjZM8/rur7EMPY2yt+2q/1ZfLVCRn9856JqTIq0XRpDUe4nKQ
-8BlA7wDVZoSDxUZkSuTIyExbDf0cpw89Tcf62Mxmi8jh74vRlPy1PgjWL5494b3X
-5fxDidH4bqPZyxTBqPrUFuo+EfUVEqiGF94Ppq6ZUvrBGOVo1V1+Ifm9CGEK597c
-aevcGc1RFlgxIgN84UpuDjPR9/zSndwJ7XsXYvZ6HXcKGagRKsfYDWGPkA5cOL/e
-f+yObOnC43yPUvpggQ4KaNJ6+SMTZOKikM8yciyBwLqwrjo8FlJgkv8Vfag/2UR7
-JINbyqHHoLUhQ2m6HXSwK4YjtwidF9EUkaBZWrrskYR3IRZLXlWqeOi/+ezYOW0m
-vufrkcvsh+TKlVVnuwmEPjJ8mwUSpsLdfPJo1DHsd8FS03SCKPaXFdD7ePfEjiYk
-nHpQaKE01aWVSLUiygn7F7rYemGqV9Vt7tBw5pz0vqSC72a5E3zFzIIuHx6aANry
-Gat3aqU3qtBXOrA/dPkX9cWE+UR5wo/A2UdKJZLlGhM2WRJ3ltmGT48V9CeS6N9Y
-m4CKdzvg7EWjlTlFrd/8WJ2KoqOE9leDPeXRPncubJfJ6LLIHyG09h9kKQARAQAB
-tDpDZW50T1MgKENlbnRPUyBPZmZpY2lhbCBTaWduaW5nIEtleSkgPHNlY3VyaXR5
-QGNlbnRvcy5vcmc+iQI3BBMBAgAhBQJczFsZAhsDBgsJCAcDAgYVCAIJCgsDFgIB
-Ah4BAheAAAoJEAW1VbOEg8ZdjOsP/2ygSxH9jqffOU9SKyJDlraL2gIutqZ3B8pl
-Gy/Qnb9QD1EJVb4ZxOEhcY2W9VJfIpnf3yBuAto7zvKe/G1nxH4Bt6WTJQCkUjcs
-N3qPWsx1VslsAEz7bXGiHym6Ay4xF28bQ9XYIokIQXd0T2rD3/lNGxNtORZ2bKjD
-vOzYzvh2idUIY1DgGWJ11gtHFIA9CvHcW+SMPEhkcKZJAO51ayFBqTSSpiorVwTq
-a0cB+cgmCQOI4/MY+kIvzoexfG7xhkUqe0wxmph9RQQxlTbNQDCdaxSgwbF2T+gw
-byaDvkS4xtR6Soj7BKjKAmcnf5fn4C5Or0KLUqMzBtDMbfQQihn62iZJN6ZZ/4dg
-q4HTqyVpyuzMXsFpJ9L/FqH2DJ4exGGpBv00ba/Zauy7GsqOc5PnNBsYaHCply0X
-407DRx51t9YwYI/ttValuehq9+gRJpOTTKp6AjZn/a5Yt3h6jDgpNfM/EyLFIY9z
-V6CXqQQ/8JRvaik/JsGCf+eeLZOw4koIjZGEAg04iuyNTjhx0e/QHEVcYAqNLhXG
-rCTTbCn3NSUO9qxEXC+K/1m1kaXoCGA0UWlVGZ1JSifbbMx0yxq/brpEZPUYm+32
-o8XfbocBWljFUJ+6aljTvZ3LQLKTSPW7TFO+GXycAOmCGhlXh2tlc6iTc41PACqy
-yy+mHmSv
-=kkH7
------END PGP PUBLIC KEY BLOCK-----
diff --git a/centos_repo/centos-appstream.repo b/centos_repo/centos-appstream.repo
deleted file mode 100644
index 45831ed..0000000
--- a/centos_repo/centos-appstream.repo
+++ /dev/null
@@ -1,9 +0,0 @@
-[appstream]
-name=CentOS Stream $releasever - AppStream
-metalink=https://mirrors.centos.org/metalink?repo=centos-appstream-$stream&arch=$basearch&protocol=https,http
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
-gpgcheck=1
-repo_gpgcheck=0
-metadata_expire=6h
-countme=1
-enabled=1
diff --git a/centos_repo/vars/stream b/centos_repo/vars/stream
deleted file mode 100644
index 0a472b5..0000000
--- a/centos_repo/vars/stream
+++ /dev/null
@@ -1 +0,0 @@
-9-stream