From a85445d069694860e0cfdd94c31ba5bfe191330b Mon Sep 17 00:00:00 2001 From: aandvalenzuela Date: Thu, 3 Aug 2023 16:29:49 +0200 Subject: [PATCH] Move libnsl to runtime and add zsh pkg --- el8/Dockerfile.buildtime | 2 +- el8/Dockerfile.runtime | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/el8/Dockerfile.buildtime b/el8/Dockerfile.buildtime index 7ee4dd4f..1e78e1c2 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 c4e67705..4947f632 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 &&\