]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
builder: touch /var/lib/rpm/* in every docker layer that uses rpmdb 8807/head
authorPeter van Dijk <peter.van.dijk@powerdns.com>
Tue, 11 Feb 2020 10:06:03 +0000 (11:06 +0100)
committerPeter van Dijk <peter.van.dijk@powerdns.com>
Tue, 11 Feb 2020 10:06:03 +0000 (11:06 +0100)
references:
https://github.com/pombredanne/dnf-plugin-ovl
https://bugzilla.redhat.com/show_bug.cgi?id=1213602

builder-support/dockerfiles/Dockerfile.rpmbuild
builder-support/dockerfiles/Dockerfile.target.amazon-2
builder-support/dockerfiles/Dockerfile.target.centos-6
builder-support/dockerfiles/Dockerfile.target.centos-7
builder-support/dockerfiles/Dockerfile.target.centos-8

index 4f48621df5fef9f8c95db6333822c286431a95d8..a7e3d3dabeb05e63fd6b821e0f1dd0e5353f4b29 100644 (file)
@@ -1,5 +1,6 @@
 FROM dist-base as package-builder
-RUN yum install -y rpm-build rpmdevtools /usr/bin/python3 && \
+RUN touch /var/lib/rpm/* && \
+    yum install -y rpm-build rpmdevtools /usr/bin/python3 && \
     yum groupinstall -y "Development Tools" && \
     rpmdev-setuptree
 
@@ -42,7 +43,7 @@ RUN if $(grep -q 'release 6' /etc/redhat-release); then \
       true ; \
     else \
       mkdir /libh2o && cd /libh2o && \
-      yum install -y curl openssl-devel cmake && \
+      touch /var/lib/rpm/* && 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 && \
index 43b17135a2782358f9e94ef38d77cf3b9d87ceaa..32b7953b9a423087da30a62df4fd3f528d4f3b7b 100644 (file)
@@ -5,7 +5,7 @@
 # Put only the bare minimum of common commands here, without dev tools
 FROM amazonlinux:2 as dist-base
 ARG BUILDER_CACHE_BUSTER=
-RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+RUN touch /var/lib/rpm/* && yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
 
 # Do the actual rpm build
 @INCLUDE Dockerfile.rpmbuild
index f60feef89b9ecfb7452482885940a284d37609cc..28e73cf1604b64f06534491ecc198e2925e4d4c7 100644 (file)
@@ -6,8 +6,8 @@
 FROM centos:6 as dist-base
 ARG BUILDER_CACHE_BUSTER=
 RUN which yum
-RUN yum clean all
-RUN yum install -y --verbose epel-release centos-release-scl-rh && \
+RUN touch /var/lib/rpm/* && yum clean all
+RUN touch /var/lib/rpm/* && yum install -y --verbose epel-release centos-release-scl-rh && \
     yum install -y --nogpgcheck devtoolset-7-gcc-c++
 
 # Do the actual rpm build
index 631308285dbe969916dcab2654ded73af4b91d04..68acb73001dfe974d355766b4991759891e3015a 100644 (file)
@@ -5,7 +5,7 @@
 # Put only the bare minimum of common commands here, without dev tools
 FROM centos:7 as dist-base
 ARG BUILDER_CACHE_BUSTER=
-RUN yum install -y epel-release
+RUN touch /var/lib/rpm/* && yum install -y epel-release
 
 # Do the actual rpm build
 @INCLUDE Dockerfile.rpmbuild
index 0a123c546ff9c7f01fc458c0906f3d2d113bd6ca..02316043cbee6bd1647d91a3181f6514cb64ce5c 100644 (file)
@@ -5,7 +5,7 @@
 # Put only the bare minimum of common commands here, without dev tools
 FROM centos:8 as dist-base
 ARG BUILDER_CACHE_BUSTER=
-RUN yum install -y epel-release && \
+RUN touch /var/lib/rpm/* && yum install -y epel-release && \
     dnf install -y 'dnf-command(config-manager)' && \
     dnf config-manager --set-enabled PowerTools