From aca6f6031984ffe2c638b6afe5a8a83cac43209c Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@icinga.com>
Date: Thu, 20 May 2021 16:09:43 +0200
Subject: [PATCH] Drop v32
---
.gitlab-ci.yml | 3 ---
32/Dockerfile | 24 ------------------------
32/Makefile | 2 --
Makefile | 2 --
4 files changed, 31 deletions(-)
delete mode 100644 32/Dockerfile
delete mode 100644 32/Makefile
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9afb7d7..a4c362f 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'
-'32':
- <<: *build_job
-
'33':
<<: *build_job
diff --git a/32/Dockerfile b/32/Dockerfile
deleted file mode 100644
index 7d93ace..0000000
--- a/32/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-FROM fedora:32
-
-RUN dnf update -y --setopt=install_weak_deps=False
-
-RUN dnf install -y --allowerasing \
- sudo wget curl which tar expect git \
- patch rpm-build redhat-rpm-config rpmlint \
- patch ccache make util-linux \
- dnf-utils rpmdevtools createrepo \
- && dnf clean all
-
-RUN wget -O /etc/yum.repos.d/ICINGA-release.repo \
- https://packages.icinga.com/fedora/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
-
-USER build
-RUN git clone https://git.icinga.com/build-docker/scripts.git /usr/local/bin
-ENTRYPOINT ["/usr/local/bin/icinga-build-entrypoint"]
-CMD ["icinga-build-package"]
diff --git a/32/Makefile b/32/Makefile
deleted file mode 100644
index f451fe1..0000000
--- a/32/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-VARIANT := x86_64
-include ../image.mk
diff --git a/Makefile b/Makefile
index 8356c41..9954265 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,5 @@
all:
- $(MAKE) -C 32
$(MAKE) -C 33
push:
- $(MAKE) -C 32 push
$(MAKE) -C 33 push
--
GitLab