maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RHEL9 container build/build_oai: switch to dnf

Browse Source
This commit is contained in:
Robert Schmidt
2023-06-05 17:49:06 +02:00
committed by Jaroslava Fiedlerova
parent a553b4c6a2
commit a834c10bd7
10 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake_targets/tools/build_helper
+1 -1
View File
@@ -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")
case "$OS_DISTRO" in
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" ;;
centos) OS_BASEDISTRO="centos"; INSTALLER="yum"; CMAKE="cmake3" ;;
debian) OS_BASEDISTRO="debian"; INSTALLER="apt-get"; CMAKE="cmake" ;;
docker/Dockerfile.base.rhel9
+3 -3
View File
@@ -42,11 +42,11 @@ COPY ./rhsm-ca /etc/rhsm/ca
ENV SMDEV_CONTAINER_OFF=1
#install developers pkg/repo
RUN rm -f /etc/rhsm-host && \
yum repolist --disablerepo=* && \
dnf repolist --disablerepo=* && \
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 && \
yum update -y && \
yum install -y \
dnf update -y && \
dnf install -y \
#gcc needed for build_oai
gcc gcc-c++ \
diffutils \
docker/Dockerfile.clang.rhel9
+1 -1
View File
@@ -32,7 +32,7 @@ WORKDIR /oai-ran
COPY . .
#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 /bin/sh oaienv && \
docker/Dockerfile.eNB.rhel9
+2 -2
View File
@@ -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
ENV TZ=Europe/Paris
RUN yum update -y && \
yum install -y --enablerepo="ubi-9-codeready-builder" \
RUN dnf update -y && \
dnf install -y --enablerepo="ubi-9-codeready-builder" \
lksctp-tools \
tzdata \
procps-ng \
docker/Dockerfile.gNB.aw2s.rhel9
+3 -3
View File
@@ -41,9 +41,9 @@ RUN /bin/sh oaienv && \
FROM registry.access.redhat.com/ubi9/ubi:latest as oai-gnb-aw2s
ENV TZ=Europe/Paris
RUN yum repolist --disablerepo=* && \
yum update -y && \
yum install -y --enablerepo="ubi-9-codeready-builder" \
RUN dnf repolist --disablerepo=* && \
dnf update -y && \
dnf install -y --enablerepo="ubi-9-codeready-builder" \
procps-ng \
libXpm \
libX11 \
docker/Dockerfile.gNB.rhel9
+3 -3
View File
@@ -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
ENV TZ=Europe/Paris
RUN yum repolist --disablerepo=* && \
yum update -y && \
yum install -y --enablerepo="ubi-9-codeready-builder" \
RUN dnf repolist --disablerepo=* && \
dnf update -y && \
dnf install -y --enablerepo="ubi-9-codeready-builder" \
procps-ng \
libXpm \
libX11 \
docker/Dockerfile.lteRU.rhel9
+2 -2
View File
@@ -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
ENV TZ=Europe/Paris
RUN yum update -y && \
yum install -y --enablerepo="ubi-9-codeready-builder" \
RUN dnf update -y && \
dnf install -y --enablerepo="ubi-9-codeready-builder" \
tzdata \
procps-ng \
atlas \
docker/Dockerfile.lteUE.rhel9
+2 -2
View File
@@ -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
ENV TZ=Europe/Paris
RUN yum update -y && \
yum install -y --enablerepo="ubi-9-codeready-builder" \
RUN dnf update -y && \
dnf install -y --enablerepo="ubi-9-codeready-builder" \
lksctp-tools \
procps-ng \
tzdata \
docker/Dockerfile.nrUE.rhel9
+2 -2
View File
@@ -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
ENV TZ=Europe/Paris
RUN yum update -y && \
yum install -y --enablerepo="ubi-9-codeready-builder" \
RUN dnf update -y && \
dnf install -y --enablerepo="ubi-9-codeready-builder" \
lksctp-tools \
procps-ng \
tzdata \
docker/Dockerfile.phySim.rhel9
+3 -3
View File
@@ -32,7 +32,7 @@ WORKDIR /oai-ran
COPY . .
#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 /bin/sh oaienv && \
@@ -43,8 +43,8 @@ RUN /bin/sh oaienv && \
#start from scratch for target executable
FROM registry.access.redhat.com/ubi9/ubi:latest as oai-physim
RUN yum update -y && \
yum install -y --enablerepo="ubi-9-codeready-builder" \
RUN dnf update -y && \
dnf install -y --enablerepo="ubi-9-codeready-builder" \
lksctp-tools \
tzdata \
atlas \