Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[el8-runtime] Move libnsl to runtime image and add zsh pkg #206

Merged
merged 2 commits into from
Aug 3, 2023
Merged

[el8-runtime] Move libnsl to runtime image and add zsh pkg #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a85445d
Move libnsl to runtime and add zsh pkg
aandvalenzuela Aug 3, 2023
0e115b7
Allow testing for runtime image
aandvalenzuela Aug 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion el8/Dockerfile.buildtime
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&\
Expand Down
4 changes: 2 additions & 2 deletions el8/Dockerfile.runtime
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&\
Expand Down
2 changes: 0 additions & 2 deletions el8/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ groups:
runtime:
docker: Dockerfile.${group0}
from: library/almalinux:8
variables:
SKIP_TESTS: true
groups:
x86_64:
tags:
Expand Down