From b84337326c8b4d5f04122b16cdd9d35019ce46e4 Mon Sep 17 00:00:00 2001 From: Hrithik Kulkarni Date: Fri, 7 Mar 2025 16:13:09 +0530 Subject: [PATCH 1/2] replace yum with microdnf --- kafka-rest/Dockerfile.ubi8 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kafka-rest/Dockerfile.ubi8 b/kafka-rest/Dockerfile.ubi8 index 27c5bbc2f..9542eef94 100644 --- a/kafka-rest/Dockerfile.ubi8 +++ b/kafka-rest/Dockerfile.ubi8 @@ -14,9 +14,9 @@ # limitations under the License. ARG DOCKER_UPSTREAM_REGISTRY -ARG DOCKER_UPSTREAM_TAG=ubi8-latest +ARG DOCKER_UPSTREAM_TAG=ubi9-latest -FROM ${DOCKER_UPSTREAM_REGISTRY}confluentinc/cp-base-new:${DOCKER_UPSTREAM_TAG} +FROM ${DOCKER_UPSTREAM_REGISTRY}confluentinc/cp-base-java:${DOCKER_UPSTREAM_TAG} ARG PROJECT_VERSION ARG ARTIFACT_ID @@ -57,7 +57,7 @@ baseurl=${CONFLUENT_PACKAGES_REPO}/ \n\ gpgcheck=1 \n\ gpgkey=${CONFLUENT_PACKAGES_REPO}/archive.key \n\ enabled=1 " > /etc/yum.repos.d/confluent.repo \ - && yum install -y \ + && microdnf install -y \ confluent-${COMPONENT}-${CONFLUENT_VERSION} \ confluent-control-center-${CONFLUENT_VERSION} \ # We are installing confluent-telemetry package explicitly because @@ -66,7 +66,7 @@ enabled=1 " > /etc/yum.repos.d/confluent.repo \ confluent-telemetry-${CONFLUENT_VERSION} \ confluent-security-${CONFLUENT_VERSION} \ && echo "===> clean up ..." \ - && yum clean all \ + && microdnf clean all \ && rm -rf /tmp/* /etc/yum.repos.d/confluent.repo \ && echo "===> Setting up ${COMPONENT} dirs" \ && chown appuser:root -R /etc/${COMPONENT} \ From 156d7ee03bf95e6de1acc459fe362e97e8ba9260 Mon Sep 17 00:00:00 2001 From: Hrithik Kulkarni Date: Fri, 7 Mar 2025 20:35:03 +0530 Subject: [PATCH 2/2] use master build --- .semaphore/semaphore.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 23367d6b7..3d8b85ac5 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -43,6 +43,7 @@ global_job_config: - export URL_CONFLUENT_VERSION=$(echo $CONFLUENT_VERSION | awk -F . '{print $1"."$2}') - export PACKAGES_URL="https://s3-us-west-2.amazonaws.com/dev-confluent-packages-654654529379-us-west-2/$BRANCH_TAG/$LATEST_PACKAGING_BUILD_NUMBER/PACKAGE_TYPE/$URL_CONFLUENT_VERSION" - export PACKAGING_BUILD_NUMBER=$LATEST_PACKAGING_BUILD_NUMBER + - export PACKAGES_URL="https://s3-us-west-2.amazonaws.com/dev-confluent-packages-654654529379-us-west-2/failed/master/7643/rpm/8.0" - >- if [[ $IS_BETA || $IS_HOTFIX || $IS_POST ]]; then export PLATFORM_LABEL=$(echo $BRANCH_TAG | awk -F - '{print "~"$2}')