From 6ee9b9f62b750a2becae32f4c48f7890f6769d32 Mon Sep 17 00:00:00 2001 From: romeroalx Date: Tue, 4 Jun 2024 11:16:18 +0200 Subject: [PATCH] remove centos-8 and centos-8-stream as build targets --- .github/workflows/builder.yml | 1 - .../dockerfiles/Dockerfile.target.centos-8 | 34 ------------------- .../Dockerfile.target.centos-8-amd64 | 1 - .../Dockerfile.target.centos-8-arm64 | 1 - .../Dockerfile.target.centos-8-stream | 1 - 5 files changed, 38 deletions(-) delete mode 100644 builder-support/dockerfiles/Dockerfile.target.centos-8 delete mode 120000 builder-support/dockerfiles/Dockerfile.target.centos-8-amd64 delete mode 120000 builder-support/dockerfiles/Dockerfile.target.centos-8-arm64 delete mode 120000 builder-support/dockerfiles/Dockerfile.target.centos-8-stream diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml index 613c4b48ce..ef203e88aa 100644 --- a/.github/workflows/builder.yml +++ b/.github/workflows/builder.yml @@ -27,7 +27,6 @@ jobs: os: - centos-7 - el-8 - - centos-8-stream - centos-9-stream - ubuntu-lunar - ubuntu-mantic diff --git a/builder-support/dockerfiles/Dockerfile.target.centos-8 b/builder-support/dockerfiles/Dockerfile.target.centos-8 deleted file mode 100644 index 237ff5ad09..0000000000 --- a/builder-support/dockerfiles/Dockerfile.target.centos-8 +++ /dev/null @@ -1,34 +0,0 @@ -# First do the source builds -@INCLUDE Dockerfile.target.sdist - -# This defines the distribution base layer -# Put only the bare minimum of common commands here, without dev tools -@IF [ ${BUILDER_TARGET} = centos-8 ] -FROM centos:8 as dist-base -@ENDIF -@IF [ ${BUILDER_TARGET} = centos-8-stream ] -FROM quay.io/centos/centos:stream8 as dist-base -@ENDIF -@IF [ ${BUILDER_TARGET} = centos-8-amd64 ] -FROM amd64/centos:8 as dist-base -@ENDIF -@IF [ ${BUILDER_TARGET} = centos-8-arm64 ] -FROM arm64v8/centos:8 as dist-base -@ENDIF - -ARG BUILDER_CACHE_BUSTER= - -@IF [[ $BUILDER_TARGET = centos-*-stream ]] -RUN touch /var/lib/rpm/* && dnf swap -y centos-linux-repos centos-stream-repos && dnf -y distro-sync -@ENDIF - -RUN touch /var/lib/rpm/* && dnf install -y epel-release && \ - dnf install -y 'dnf-command(config-manager)' && \ - dnf config-manager --set-enabled powertools - -# Do the actual rpm build -@INCLUDE Dockerfile.rpmbuild - -# Do a test install and verify -# Can be skipped with skippackagetest=1 in the environment -@EXEC [ "$skippackagetest" = "" ] && include Dockerfile.rpmtest diff --git a/builder-support/dockerfiles/Dockerfile.target.centos-8-amd64 b/builder-support/dockerfiles/Dockerfile.target.centos-8-amd64 deleted file mode 120000 index cfe890509a..0000000000 --- a/builder-support/dockerfiles/Dockerfile.target.centos-8-amd64 +++ /dev/null @@ -1 +0,0 @@ -Dockerfile.target.centos-8 \ No newline at end of file diff --git a/builder-support/dockerfiles/Dockerfile.target.centos-8-arm64 b/builder-support/dockerfiles/Dockerfile.target.centos-8-arm64 deleted file mode 120000 index cfe890509a..0000000000 --- a/builder-support/dockerfiles/Dockerfile.target.centos-8-arm64 +++ /dev/null @@ -1 +0,0 @@ -Dockerfile.target.centos-8 \ No newline at end of file diff --git a/builder-support/dockerfiles/Dockerfile.target.centos-8-stream b/builder-support/dockerfiles/Dockerfile.target.centos-8-stream deleted file mode 120000 index cfe890509a..0000000000 --- a/builder-support/dockerfiles/Dockerfile.target.centos-8-stream +++ /dev/null @@ -1 +0,0 @@ -Dockerfile.target.centos-8 \ No newline at end of file -- 2.47.2