diff --git a/el8/Dockerfile.buildtime b/el8/Dockerfile.buildtime index 7ee4dd4..1e78e1c 100644 --- a/el8/Dockerfile.buildtime +++ b/el8/Dockerfile.buildtime @@ -10,7 +10,7 @@ RUN dnf install --disablerepo=epel -y perl-Carp perl-PathTools perl-Data-Dumper perl-IO-Compress &&\ dnf install --disablerepo=epel -y tar rpm-build git nspr nss rsync wget openssl-devel ncurses-devel \ libX11-devel readline-devel tcl-devel tk-devel mesa-libGLU-devel libXext-devel libXft-devel \ - libXpm-devel java-1.8.0-openjdk-devel java-11-openjdk-devel libtool gcc-c++ libnsl &&\ + libXpm-devel java-1.8.0-openjdk-devel java-11-openjdk-devel libtool gcc-c++ &&\ dnf --enablerepo=powertools install -y texinfo &&\ epel_pkgs="@EPEL_PACKAGES@" &&\ if [ -n "$epel_pkgs" ] ; then dnf install -y $epel_pkgs; fi &&\ diff --git a/el8/Dockerfile.runtime b/el8/Dockerfile.runtime index c4e6770..4947f63 100644 --- a/el8/Dockerfile.runtime +++ b/el8/Dockerfile.runtime @@ -7,8 +7,8 @@ ADD CERN.repo /tmp/CERN.repo ADD RPM-GPG-KEY-kojiv2 /tmp/RPM-GPG-KEY-kojiv2 ADD fix_ssh_config.sh /tmp/fix_ssh_config.sh -RUN dnf install -y @DEFAULT_PACKAGES@ bash tcsh glibc glibc-headers libxcrypt openssl-libs libcom_err krb5-libs ncurses-libs perl \ - perl-libs libX11 readline tcl tk mesa-libGLU libglvnd-glx libglvnd-opengl libXext libXft libXpm libaio &&\ +RUN dnf install -y @DEFAULT_PACKAGES@ bash tcsh zsh glibc glibc-headers libxcrypt openssl-libs libcom_err krb5-libs ncurses-libs perl \ + perl-libs libX11 readline tcl tk mesa-libGLU libglvnd-glx libglvnd-opengl libXext libXft libXpm libaio libnsl &&\ dnf install -y python2 python3 which procps-ng &&\ dnf install -y epel-release &&\ dnf install -y @EPEL_PACKAGES@ apptainer &&\ diff --git a/el8/config.yaml b/el8/config.yaml index 353f5e1..5aa47d3 100644 --- a/el8/config.yaml +++ b/el8/config.yaml @@ -31,8 +31,6 @@ groups: runtime: docker: Dockerfile.${group0} from: library/almalinux:8 - variables: - SKIP_TESTS: true groups: x86_64: tags: