From b6d59ca38eaae7e18c949d0e4b8ceab4b8704776 Mon Sep 17 00:00:00 2001 From: Markus Frosch <markus.frosch@icinga.com> Date: Thu, 2 May 2019 16:16:38 +0200 Subject: [PATCH] Add fedora 30 --- .gitlab-ci.yml | 3 +++ 30/Dockerfile | 25 +++++++++++++++++++++++++ 30/Makefile | 2 ++ Makefile | 2 ++ 4 files changed, 32 insertions(+) create mode 100644 30/Dockerfile create mode 100644 30/Makefile diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7c29a7c..37c4888 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,3 +23,6 @@ before_script: '29': <<: *build_job + +'30': + <<: *build_job diff --git a/30/Dockerfile b/30/Dockerfile new file mode 100644 index 0000000..0c1675f --- /dev/null +++ b/30/Dockerfile @@ -0,0 +1,25 @@ +FROM fedora:30 + +RUN dnf update -y --setopt=install_weak_deps=False + +# TODO: Remove this once the build deps for boost have been cleaned up... +RUN echo '%build_icinga_org 1' >/etc/rpm/macros.icinga_build + +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 groupadd -g 1000 jenkins \ + && useradd -u 1000 -g 1000 -m jenkins \ + && echo 'Defaults:jenkins !requiretty' | tee -a /etc/sudoers \ + && echo 'jenkins ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers + +RUN wget -O /etc/yum.repos.d/ICINGA-release.repo \ + https://packages.icinga.com/fedora/ICINGA-release.repo + +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/30/Makefile b/30/Makefile new file mode 100644 index 0000000..f451fe1 --- /dev/null +++ b/30/Makefile @@ -0,0 +1,2 @@ +VARIANT := x86_64 +include ../image.mk diff --git a/Makefile b/Makefile index 99df84d..fb2cdba 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,9 @@ all: $(MAKE) -C 28 $(MAKE) -C 29 + $(MAKE) -C 30 push: $(MAKE) -C 28 push $(MAKE) -C 29 push + $(MAKE) -C 30 push -- GitLab