Skip to content
Snippets Groups Projects
Commit 20f65330 authored by Noah Hilverling's avatar Noah Hilverling
Browse files

Merge branch '33' into 'master'

Add Fedora 33

See merge request !1
parents eb78dfa2 1362f3cc
No related branches found
No related tags found
1 merge request!1Add Fedora 33
Pipeline #14058 passed
...@@ -29,3 +29,6 @@ before_script: ...@@ -29,3 +29,6 @@ before_script:
'32': '32':
<<: *build_job <<: *build_job
'33':
<<: *build_job
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"]
VARIANT := x86_64
include ../image.mk
...@@ -3,9 +3,11 @@ all: ...@@ -3,9 +3,11 @@ all:
$(MAKE) -C 30 $(MAKE) -C 30
$(MAKE) -C 31 $(MAKE) -C 31
$(MAKE) -C 32 $(MAKE) -C 32
$(MAKE) -C 33
push: push:
$(MAKE) -C 29 push $(MAKE) -C 29 push
$(MAKE) -C 30 push $(MAKE) -C 30 push
$(MAKE) -C 31 push $(MAKE) -C 31 push
$(MAKE) -C 32 push $(MAKE) -C 32 push
$(MAKE) -C 33 push
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment