From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Tue, 16 Apr 2019 09:45:26 +0000 (+0200)
Subject: Ensure building libh2o is cached in docker
X-Git-Tag: dnsdist-1.4.0-alpha2~6^2~20^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b4a7e6b2fa7ee6ea83b1cadd4ffded1967b17912;p=pdns

Ensure building libh2o is cached in docker
---

diff --git a/builder-support/dockerfiles/Dockerfile.rpmbuild b/builder-support/dockerfiles/Dockerfile.rpmbuild
index 3d8ac4a7e..468bded62 100644
--- a/builder-support/dockerfiles/Dockerfile.rpmbuild
+++ b/builder-support/dockerfiles/Dockerfile.rpmbuild
@@ -39,14 +39,19 @@ RUN if $(grep -q 'release 6' /etc/redhat-release); then \
 
 @IF [ ! -z "$M_dnsdist$M_all" ]
 RUN if $(grep -q 'release 6' /etc/redhat-release); then \
-      scl enable devtoolset-7 -- builder/helpers/build-specs.sh builder-support/specs/dnsdist.spec; \
+      true ; \
     else \
       mkdir /libh2o && cd /libh2o && \
       yum install -y curl openssl-devel cmake && \
       curl -L https://github.com/h2o/h2o/archive/v2.2.5.tar.gz | tar xz && \
       CFLAGS='-fPIC' cmake -DWITH_PICOTLS=off -DWITH_BUNDLED_SSL=off -DWITH_MRUBY=off -DCMAKE_INSTALL_PREFIX=/opt ./h2o-2.2.5 && \
       make install && \
-      cd /pdns && \
+      cd /pdns; \
+    fi
+
+RUN if $(grep -q 'release 6' /etc/redhat-release); then \
+      scl enable devtoolset-7 -- builder/helpers/build-specs.sh builder-support/specs/dnsdist.spec; \
+    else \
       builder/helpers/build-specs.sh builder-support/specs/dnsdist.spec; \
     fi
 @ENDIF