From 5e6f0856cb032b983251597354af6acdff25603f Mon Sep 17 00:00:00 2001 From: Markus Frosch <markus.frosch@icinga.com> Date: Sun, 1 Sep 2019 11:47:51 +0200 Subject: [PATCH] Remove build_icinga_org macro --- 29/Dockerfile | 3 --- 30/Dockerfile | 3 --- 2 files changed, 6 deletions(-) diff --git a/29/Dockerfile b/29/Dockerfile index 5f917a8..f6a680b 100644 --- a/29/Dockerfile +++ b/29/Dockerfile @@ -8,9 +8,6 @@ RUN rpm --rebuilddb; \ RUN dnf update -y --setopt=install_weak_deps=False # 20190502 -# 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 \ diff --git a/30/Dockerfile b/30/Dockerfile index 0c1675f..32eae20 100644 --- a/30/Dockerfile +++ b/30/Dockerfile @@ -2,9 +2,6 @@ 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 \ -- GitLab