From 4eb630f7e97a35b0f7b4ac885cd61af3c74c0d60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Tue, 11 Apr 2023 17:23:48 +0200 Subject: RPM: update docker scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: François Andriot --- redhat/docker/el8/Dockerfile.x86_64 | 5 +++-- redhat/docker/el8/packages | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'redhat/docker/el8') diff --git a/redhat/docker/el8/Dockerfile.x86_64 b/redhat/docker/el8/Dockerfile.x86_64 index 7fdb8bdb9..78f152ba6 100644 --- a/redhat/docker/el8/Dockerfile.x86_64 +++ b/redhat/docker/el8/Dockerfile.x86_64 @@ -1,4 +1,4 @@ -FROM centos:8 +FROM rockylinux:8 ARG TDE_VERSION=14.1.0 ARG ARCH=x86_64 @@ -14,7 +14,8 @@ COPY centos-devel.repo /etc/yum.repos.d/centos-devel.repo # Enable supplementary repositories # Install Trinity build dependencies COPY packages /packages -RUN echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" \ +RUN set -x \ + && echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" \ && curl -o /usr/lib/python3.6/site-packages/dnf-plugins/ovl.py https://raw.githubusercontent.com/FlorianLudwig/dnf-plugin-ovl/master/ovl.py \ && dnf -y update \ && dnf -y install epel-release \ diff --git a/redhat/docker/el8/packages b/redhat/docker/el8/packages index 4ba3e2fca..06283e94e 100644 --- a/redhat/docker/el8/packages +++ b/redhat/docker/el8/packages @@ -45,6 +45,7 @@ gamin-devel gcc gcc-c++ gcc-gfortran +geoip-devel gettext-devel giflib-devel glibmm24-devel -- cgit v1.2.3