From 5e7258448b1d82c1b3c886b0f6773ad9243d8fe4 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" <alexander.klimov@icinga.com> Date: Wed, 30 Mar 2022 15:42:25 +0200 Subject: [PATCH] Drop CentOS 8 --- .gitlab-ci.yml | 3 --- 8/Dockerfile | 39 --------------------------------------- 8/Makefile | 2 -- Makefile | 2 -- 4 files changed, 46 deletions(-) delete mode 100644 8/Dockerfile delete mode 100644 8/Makefile diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a751110..877f39a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,8 +18,5 @@ before_script: - make -C ${CI_JOB_NAME} - '[ "$CI_COMMIT_REF_NAME" != master ] || make -C ${CI_JOB_NAME} push' -'8': - <<: *build_job - '7': <<: *build_job diff --git a/8/Dockerfile b/8/Dockerfile deleted file mode 100644 index 4600acd..0000000 --- a/8/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -FROM centos:8 - -RUN dnf update -y && dnf clean all - -RUN dnf install -y \ - sudo wget curl which tar expect git \ - patch rpm-build redhat-rpm-config rpmlint \ - patch make util-linux \ - dnf-utils rpmdevtools createrepo \ - epel-release \ - && dnf clean all - -RUN dnf config-manager --set-enabled powertools - -RUN dnf install -y \ - boost-devel \ - bison \ - cmake \ - openssl-devel \ - libedit-devel \ - ccache \ - gcc gcc-c++ \ - && dnf clean all - -RUN wget -O /etc/yum.repos.d/ICINGA-release.repo \ - https://packages.icinga.com/epel/ICINGA-release.repo - -RUN groupadd -g 1000 build \ - && useradd -u 1000 -g 1000 -m build \ - && echo 'Defaults:build !requiretty' | tee -a /etc/sudoers \ - && echo 'build ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers \ - && chown build.build /usr/local/bin - - -RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin -RUN icinga-provide-go -USER build -ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"] -CMD ["icinga-build-package"] diff --git a/8/Makefile b/8/Makefile deleted file mode 100644 index f451fe1..0000000 --- a/8/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -VARIANT := x86_64 -include ../image.mk diff --git a/Makefile b/Makefile index 6b31ee2..d7def5f 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,5 @@ all: $(MAKE) -C 7 - $(MAKE) -C 8 push: $(MAKE) -C 7 push - $(MAKE) -C 8 push -- GitLab