From dab17916b7071326f6f463d57103b76a19d6f0a2 Mon Sep 17 00:00:00 2001 From: Markus Frosch <markus.frosch@icinga.com> Date: Mon, 2 Sep 2019 11:08:53 +0200 Subject: [PATCH] Remove obsolete build_icinga_org macro --- 6-i386/Dockerfile | 3 --- 6/Dockerfile | 3 --- 7/Dockerfile | 3 --- 3 files changed, 9 deletions(-) diff --git a/6-i386/Dockerfile b/6-i386/Dockerfile index 660c447..28ff75e 100644 --- a/6-i386/Dockerfile +++ b/6-i386/Dockerfile @@ -5,9 +5,6 @@ RUN echo i686-redhat-linux-gnu >/etc/rpm/platform RUN yum update -y -# 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 yum install -y \ sudo wget curl which tar expect git \ patch rpm-build redhat-rpm-config rpmlint \ diff --git a/6/Dockerfile b/6/Dockerfile index 9c589dc..34d1183 100644 --- a/6/Dockerfile +++ b/6/Dockerfile @@ -2,9 +2,6 @@ FROM centos:6 RUN yum update -y -# 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 yum install -y \ sudo wget curl which tar expect git \ patch rpm-build redhat-rpm-config rpmlint \ diff --git a/7/Dockerfile b/7/Dockerfile index 9949d4a..5ac1049 100644 --- a/7/Dockerfile +++ b/7/Dockerfile @@ -2,9 +2,6 @@ FROM centos:7 RUN yum update -y -# 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 yum install -y \ sudo wget curl which tar expect git \ patch rpm-build redhat-rpm-config rpmlint \ -- GitLab