diff options
Diffstat (limited to 'redhat/docker/el8')
-rw-r--r-- | redhat/docker/el8/Dockerfile.x86_64 | 15 | ||||
-rw-r--r-- | redhat/docker/el8/packages | 6 |
2 files changed, 14 insertions, 7 deletions
diff --git a/redhat/docker/el8/Dockerfile.x86_64 b/redhat/docker/el8/Dockerfile.x86_64 index 090d63f9d..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 \ @@ -40,19 +41,19 @@ COPY rpmmacros /home/trinity/.rpmmacros # Build supplementary development tools -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/g/gnuchess-6.2.5-10.fc32.src.rpm \ +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/g/gnuchess-6.2.9-3.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/gnuchess-6*.rpm -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/p/pilot-link-0.12.5-44.fc32.src.rpm \ +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/pilot-link-0.12.5-50.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link-{devel,libs}-0*.rpm RUN sudo rpm -Uvh http://rpms.remirepo.net/enterprise/8/remi/x86_64/hiredis-0.13.3-9.el8.remi.x86_64.rpm http://rpms.remirepo.net/enterprise/8/remi/x86_64/libyaz{,-devel}-5.14.11-14.el8.remi.x86_64.rpm -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/perl-PAR-1.015-8.fc30.src.rpm \ +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-PAR-1.017-5.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/perl-Getopt-ArgvFile-1.11-28.fc30.src.rpm \ +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-Getopt-ArgvFile-1.11-37.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-1*.rpm -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/p/perl-PAR-Packer-1.047-4.fc30.src.rpm --nocheck \ +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-PAR-Packer-1.054-3.fc36.src.rpm --nocheck \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm diff --git a/redhat/docker/el8/packages b/redhat/docker/el8/packages index deb431bbe..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 @@ -61,7 +62,9 @@ gtk3-devel gtk-doc guile-devel heimdal-devel +help2man hspell-devel +html2ps icu ImageMagick-devel imake @@ -93,6 +96,7 @@ libgsf-devel libgssglue-devel libical-devel libidn-devel +libjpeg-turbo-utils libksba-devel libmad-devel libmemcached-devel @@ -114,6 +118,7 @@ libsamplerate-devel libsecret-devel libsmbclient-devel libsndfile-devel +libssh-devel libtheora-devel libtiff-devel libtirpc-devel @@ -210,6 +215,7 @@ systemd-devel taglib-devel tcl texinfo +texlive-dvips torsocks transfig unixODBC-devel |