From 1362f3ccbd7965b3f39ed544d754f04f8afdbd3b Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" <alexander.klimov@icinga.com> Date: Thu, 12 Nov 2020 16:46:15 +0100 Subject: [PATCH] Add Fedora 33 --- .gitlab-ci.yml | 3 +++ 33/Dockerfile | 24 ++++++++++++++++++++++++ 33/Makefile | 2 ++ Makefile | 2 ++ 4 files changed, 31 insertions(+) create mode 100644 33/Dockerfile create mode 100644 33/Makefile diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2f1021b..ca19e5b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,3 +29,6 @@ before_script: '32': <<: *build_job + +'33': + <<: *build_job diff --git a/33/Dockerfile b/33/Dockerfile new file mode 100644 index 0000000..9d3d0db --- /dev/null +++ b/33/Dockerfile @@ -0,0 +1,24 @@ +FROM fedora:33 + +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/33/Makefile b/33/Makefile new file mode 100644 index 0000000..f451fe1 --- /dev/null +++ b/33/Makefile @@ -0,0 +1,2 @@ +VARIANT := x86_64 +include ../image.mk diff --git a/Makefile b/Makefile index 631ab57..0a0c2f8 100644 --- a/Makefile +++ b/Makefile @@ -3,9 +3,11 @@ all: $(MAKE) -C 30 $(MAKE) -C 31 $(MAKE) -C 32 + $(MAKE) -C 33 push: $(MAKE) -C 29 push $(MAKE) -C 30 push $(MAKE) -C 31 push $(MAKE) -C 32 push + $(MAKE) -C 33 push -- GitLab