From 23c7861ca8b85cf3a08637b92585f4e53287748f Mon Sep 17 00:00:00 2001
From: Markus Frosch <markus.frosch@icinga.com>
Date: Tue, 3 Sep 2019 17:57:48 +0200
Subject: [PATCH] Re-add build_icinga_org macro to be able to build Icinga 2.10

---
 6-i386/Dockerfile | 3 +++
 6/Dockerfile      | 3 +++
 7/Dockerfile      | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/6-i386/Dockerfile b/6-i386/Dockerfile
index 5169ebb..31aa59e 100644
--- a/6-i386/Dockerfile
+++ b/6-i386/Dockerfile
@@ -34,6 +34,9 @@ RUN wget -O /etc/yum.repos.d/ICINGA-release.repo \
 RUN wget -O /etc/yum.repos.d/devtoolset-2.repo https://people.centos.org/tru/devtools-2/devtools-2.repo \
  && yum install -y devtoolset-2-gcc devtoolset-2-gcc-c++ devtoolset-2-binutils
 
+# 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 groupadd -g 1000 build \
  && useradd -u 1000 -g 1000 -m build \
  && echo 'Defaults:build !requiretty' | tee -a /etc/sudoers \
diff --git a/6/Dockerfile b/6/Dockerfile
index e76661b..656a245 100644
--- a/6/Dockerfile
+++ b/6/Dockerfile
@@ -30,6 +30,9 @@ RUN wget -O /etc/yum.repos.d/ICINGA-release.repo \
 RUN wget -O /etc/yum.repos.d/devtoolset-2.repo https://people.centos.org/tru/devtools-2/devtools-2.repo \
  && yum install -y devtoolset-2-gcc devtoolset-2-gcc-c++ devtoolset-2-binutils
 
+# 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 groupadd -g 1000 build \
  && useradd -u 1000 -g 1000 -m build \
  && echo 'Defaults:build !requiretty' | tee -a /etc/sudoers \
diff --git a/7/Dockerfile b/7/Dockerfile
index 2d6caa3..c1c25dc 100644
--- a/7/Dockerfile
+++ b/7/Dockerfile
@@ -29,6 +29,9 @@ RUN yum install -y centos-release-scl centos-release-scl-rh scl-utils-build \
 RUN wget -O /etc/yum.repos.d/ICINGA-release.repo \
  https://packages.icinga.com/epel/ICINGA-release.repo
 
+# 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 groupadd -g 1000 build \
  && useradd -u 1000 -g 1000 -m build \
  && echo 'Defaults:build !requiretty' | tee -a /etc/sudoers \
-- 
GitLab