From aba5eddfbfe67464cf285de52dc940529dcd5de4 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Tue, 5 Jan 2021 15:58:06 +0100 Subject: [PATCH] reinstate touch /var/lib/rpm/* --- builder-support/dockerfiles/Dockerfile.rpmbuild | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/builder-support/dockerfiles/Dockerfile.rpmbuild b/builder-support/dockerfiles/Dockerfile.rpmbuild index 1f04d49f27..fec1c5dedc 100644 --- a/builder-support/dockerfiles/Dockerfile.rpmbuild +++ b/builder-support/dockerfiles/Dockerfile.rpmbuild @@ -21,20 +21,20 @@ ADD builder-support/specs/ /pdns/builder-support/specs RUN find /pdns/builder-support/specs/ -not -name '*.spec' -exec ln -s {} /root/rpmbuild/SOURCES/ \; @IF [ -n "$M_authoritative$M_all" ] -RUN builder/helpers/build-specs.sh builder-support/specs/pdns.spec +RUN touch /var/lib/rpm/* && builder/helpers/build-specs.sh builder-support/specs/pdns.spec @ENDIF @IF [ -n "$M_recursor$M_all" ] -RUN builder/helpers/build-specs.sh builder-support/specs/pdns-recursor.spec +RUN touch /var/lib/rpm/* && builder/helpers/build-specs.sh builder-support/specs/pdns-recursor.spec @ENDIF @IF [ -n "$M_dnsdist$M_all" ] -RUN mkdir /libh2o && cd /libh2o && \ +RUN touch /var/lib/rpm/* && mkdir /libh2o && cd /libh2o && \ yum install -y curl openssl-devel cmake && \ curl -L https://github.com/h2o/h2o/archive/v2.2.6.tar.gz | tar xz && \ CFLAGS='-fPIC' cmake -DWITH_PICOTLS=off -DWITH_BUNDLED_SSL=off -DWITH_MRUBY=off -DCMAKE_INSTALL_PREFIX=/opt ./h2o-2.2.6 && \ make install -RUN builder/helpers/build-specs.sh builder-support/specs/dnsdist.spec +RUN touch /var/lib/rpm/* && builder/helpers/build-specs.sh builder-support/specs/dnsdist.spec @ENDIF # mv across layers with overlay2 is buggy in some kernel versions (results in empty dirs) -- 2.47.3