Commit a834c10b authored by Robert Schmidt's avatar Robert Schmidt Committed by Jaroslava Fiedlerova

RHEL9 container build/build_oai: switch to dnf

parent a553b4c6
...@@ -32,7 +32,7 @@ OS_DISTRO=$(grep "^ID=" /etc/os-release | sed "s/ID=//" | sed "s/\"//g") ...@@ -32,7 +32,7 @@ OS_DISTRO=$(grep "^ID=" /etc/os-release | sed "s/ID=//" | sed "s/\"//g")
OS_RELEASE=$(grep "^VERSION_ID=" /etc/os-release | sed "s/VERSION_ID=//" | sed "s/\"//g") OS_RELEASE=$(grep "^VERSION_ID=" /etc/os-release | sed "s/VERSION_ID=//" | sed "s/\"//g")
case "$OS_DISTRO" in case "$OS_DISTRO" in
fedora) OS_BASEDISTRO="fedora"; INSTALLER="dnf"; CMAKE="cmake" ;; fedora) OS_BASEDISTRO="fedora"; INSTALLER="dnf"; CMAKE="cmake" ;;
rhel) OS_BASEDISTRO="fedora"; INSTALLER="yum"; CMAKE="cmake3" ;; rhel) OS_BASEDISTRO="fedora"; INSTALLER="dnf"; CMAKE="cmake3" ;;
rocky) OS_BASEDISTRO="fedora"; INSTALLER="dnf"; CMAKE="cmake" ;; rocky) OS_BASEDISTRO="fedora"; INSTALLER="dnf"; CMAKE="cmake" ;;
centos) OS_BASEDISTRO="centos"; INSTALLER="yum"; CMAKE="cmake3" ;; centos) OS_BASEDISTRO="centos"; INSTALLER="yum"; CMAKE="cmake3" ;;
debian) OS_BASEDISTRO="debian"; INSTALLER="apt-get"; CMAKE="cmake" ;; debian) OS_BASEDISTRO="debian"; INSTALLER="apt-get"; CMAKE="cmake" ;;
......
...@@ -42,11 +42,11 @@ COPY ./rhsm-ca /etc/rhsm/ca ...@@ -42,11 +42,11 @@ COPY ./rhsm-ca /etc/rhsm/ca
ENV SMDEV_CONTAINER_OFF=1 ENV SMDEV_CONTAINER_OFF=1
#install developers pkg/repo #install developers pkg/repo
RUN rm -f /etc/rhsm-host && \ RUN rm -f /etc/rhsm-host && \
yum repolist --disablerepo=* && \ dnf repolist --disablerepo=* && \
subscription-manager repos --enable codeready-builder-for-rhel-9-x86_64-rpms && \ subscription-manager repos --enable codeready-builder-for-rhel-9-x86_64-rpms && \
dnf install https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm -y && \ dnf install https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm -y && \
yum update -y && \ dnf update -y && \
yum install -y \ dnf install -y \
#gcc needed for build_oai #gcc needed for build_oai
gcc gcc-c++ \ gcc gcc-c++ \
diffutils \ diffutils \
......
...@@ -32,7 +32,7 @@ WORKDIR /oai-ran ...@@ -32,7 +32,7 @@ WORKDIR /oai-ran
COPY . . COPY . .
#only install LLVM (clang, ...) for this container, the others don't need it #only install LLVM (clang, ...) for this container, the others don't need it
RUN yum install -y llvm-toolset RUN dnf install -y llvm-toolset
#run build_oai to build the target image #run build_oai to build the target image
RUN /bin/sh oaienv && \ RUN /bin/sh oaienv && \
......
...@@ -36,8 +36,8 @@ RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/enb_parameters ...@@ -36,8 +36,8 @@ RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/enb_parameters
FROM registry.access.redhat.com/ubi9/ubi:latest as oai-enb FROM registry.access.redhat.com/ubi9/ubi:latest as oai-enb
ENV TZ=Europe/Paris ENV TZ=Europe/Paris
RUN yum update -y && \ RUN dnf update -y && \
yum install -y --enablerepo="ubi-9-codeready-builder" \ dnf install -y --enablerepo="ubi-9-codeready-builder" \
lksctp-tools \ lksctp-tools \
tzdata \ tzdata \
procps-ng \ procps-ng \
......
...@@ -41,9 +41,9 @@ RUN /bin/sh oaienv && \ ...@@ -41,9 +41,9 @@ RUN /bin/sh oaienv && \
FROM registry.access.redhat.com/ubi9/ubi:latest as oai-gnb-aw2s FROM registry.access.redhat.com/ubi9/ubi:latest as oai-gnb-aw2s
ENV TZ=Europe/Paris ENV TZ=Europe/Paris
RUN yum repolist --disablerepo=* && \ RUN dnf repolist --disablerepo=* && \
yum update -y && \ dnf update -y && \
yum install -y --enablerepo="ubi-9-codeready-builder" \ dnf install -y --enablerepo="ubi-9-codeready-builder" \
procps-ng \ procps-ng \
libXpm \ libXpm \
libX11 \ libX11 \
......
...@@ -36,9 +36,9 @@ RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/gnb_parameters ...@@ -36,9 +36,9 @@ RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/gnb_parameters
FROM registry.access.redhat.com/ubi9/ubi:latest as oai-gnb FROM registry.access.redhat.com/ubi9/ubi:latest as oai-gnb
ENV TZ=Europe/Paris ENV TZ=Europe/Paris
RUN yum repolist --disablerepo=* && \ RUN dnf repolist --disablerepo=* && \
yum update -y && \ dnf update -y && \
yum install -y --enablerepo="ubi-9-codeready-builder" \ dnf install -y --enablerepo="ubi-9-codeready-builder" \
procps-ng \ procps-ng \
libXpm \ libXpm \
libX11 \ libX11 \
......
...@@ -36,8 +36,8 @@ RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/enb_parameters ...@@ -36,8 +36,8 @@ RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/enb_parameters
FROM registry.access.redhat.com/ubi9/ubi:latest as oai-lte-ru FROM registry.access.redhat.com/ubi9/ubi:latest as oai-lte-ru
ENV TZ=Europe/Paris ENV TZ=Europe/Paris
RUN yum update -y && \ RUN dnf update -y && \
yum install -y --enablerepo="ubi-9-codeready-builder" \ dnf install -y --enablerepo="ubi-9-codeready-builder" \
tzdata \ tzdata \
procps-ng \ procps-ng \
atlas \ atlas \
......
...@@ -37,8 +37,8 @@ RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/lte_ue_paramet ...@@ -37,8 +37,8 @@ RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/lte_ue_paramet
FROM registry.access.redhat.com/ubi9/ubi:latest as oai-lte-ue FROM registry.access.redhat.com/ubi9/ubi:latest as oai-lte-ue
ENV TZ=Europe/Paris ENV TZ=Europe/Paris
RUN yum update -y && \ RUN dnf update -y && \
yum install -y --enablerepo="ubi-9-codeready-builder" \ dnf install -y --enablerepo="ubi-9-codeready-builder" \
lksctp-tools \ lksctp-tools \
procps-ng \ procps-ng \
tzdata \ tzdata \
......
...@@ -36,8 +36,8 @@ RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/nr_ue_paramete ...@@ -36,8 +36,8 @@ RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/nr_ue_paramete
FROM registry.access.redhat.com/ubi9/ubi:latest as oai-nr-ue FROM registry.access.redhat.com/ubi9/ubi:latest as oai-nr-ue
ENV TZ=Europe/Paris ENV TZ=Europe/Paris
RUN yum update -y && \ RUN dnf update -y && \
yum install -y --enablerepo="ubi-9-codeready-builder" \ dnf install -y --enablerepo="ubi-9-codeready-builder" \
lksctp-tools \ lksctp-tools \
procps-ng \ procps-ng \
tzdata \ tzdata \
......
...@@ -32,7 +32,7 @@ WORKDIR /oai-ran ...@@ -32,7 +32,7 @@ WORKDIR /oai-ran
COPY . . COPY . .
#only install address and undefined behavior sanitizer for this container, the others don't need it #only install address and undefined behavior sanitizer for this container, the others don't need it
RUN yum install -y libasan libubsan RUN dnf install -y libasan libubsan
#run build_oai to build the target image #run build_oai to build the target image
RUN /bin/sh oaienv && \ RUN /bin/sh oaienv && \
...@@ -43,8 +43,8 @@ RUN /bin/sh oaienv && \ ...@@ -43,8 +43,8 @@ RUN /bin/sh oaienv && \
#start from scratch for target executable #start from scratch for target executable
FROM registry.access.redhat.com/ubi9/ubi:latest as oai-physim FROM registry.access.redhat.com/ubi9/ubi:latest as oai-physim
RUN yum update -y && \ RUN dnf update -y && \
yum install -y --enablerepo="ubi-9-codeready-builder" \ dnf install -y --enablerepo="ubi-9-codeready-builder" \
lksctp-tools \ lksctp-tools \
tzdata \ tzdata \
atlas \ atlas \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment