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

Merge remote-tracking branch 'origin/ci-update-images-rhel9' into integration_2023_w23_ci

Browse Source
This commit is contained in:
Robert Schmidt
2023-06-07 13:38:19 +02:00
parent a8c4ca5466 7c68fb4324
commit 149289ff48
25 changed files with 155 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker/Dockerfile.base.rhel8.2 → docker/Dockerfile.base.rhel9
+7 -6
View File
@@ -21,12 +21,12 @@
#---------------------------------------------------------------------
#
# Dockerfile for the Open-Air-Interface BUILD service
# Valid for RHEL8
# Valid for RHEL9
#
#---------------------------------------------------------------------
FROM registry.access.redhat.com/ubi8/ubi:latest AS ran-base
FROM registry.access.redhat.com/ubi9/ubi:latest AS ran-base
ARG NEEDED_GIT_PROXY
ENV TZ=Europe/Paris
ENV BUILD_UHD_FROM_SOURCE=True
@@ -39,12 +39,13 @@ COPY ./etc-pki-entitlement /etc/pki/entitlement
COPY ./rhsm-conf /etc/rhsm
COPY ./rhsm-ca /etc/rhsm/ca
ENV SMDEV_CONTAINER_OFF=1
#install developers pkg/repo
RUN rm -f /etc/rhsm-host && \
yum repolist --disablerepo=* && \
subscription-manager repos --enable codeready-builder-for-rhel-8-x86_64-rpms && \
yum update -y && \
yum install -y \
subscription-manager repos --enable codeready-builder-for-rhel-9-x86_64-rpms && \
dnf update -y && \
cat /etc/os-release && \
dnf install -y \
#gcc needed for build_oai
gcc gcc-c++ \
diffutils \
docker/Dockerfile.build.rhel8.2 → docker/Dockerfile.build.rhel9
+1 -1
View File
@@ -21,7 +21,7 @@
#---------------------------------------------------------------------
#
# Dockerfile for the Open-Air-Interface BUILD service
# Valid for RHEL8
# Valid for RHEL9
#
#---------------------------------------------------------------------
docker/Dockerfile.clang.rhel8.2 → docker/Dockerfile.clang.rhel9
+2 -2
View File
@@ -21,7 +21,7 @@
#---------------------------------------------------------------------
#
# Dockerfile for the Open-Air-Interface BUILD service
# Valid for RHEL8
# Valid for RHEL9
#
#---------------------------------------------------------------------
@@ -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.rhel8.2 → docker/Dockerfile.eNB.rhel9
+19 -19
View File
@@ -21,7 +21,7 @@
#---------------------------------------------------------------------
#
# Dockerfile for the Open-Air-Interface BUILD service
# Valid for RHEL8
# Valid for RHEL9
#
#---------------------------------------------------------------------
@@ -33,11 +33,11 @@ RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/enb_parameters
cp /oai-ran/docker/scripts/enb_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh
#start from scratch for target executable
FROM registry.access.redhat.com/ubi8/ubi:latest as oai-enb
FROM registry.access.redhat.com/ubi9/ubi:latest as oai-enb
ENV TZ=Europe/Paris
RUN yum update -y && \
yum install -y --enablerepo="ubi-8-codeready-builder" \
RUN dnf update -y && \
dnf install -y \
lksctp-tools \
tzdata \
procps-ng \
@@ -72,24 +72,24 @@ COPY --from=enb-build \
/usr/local/lib/
COPY --from=enb-base \
/lib64/libconfig.so.9 \
/lib64/libconfig.so.11 \
/lib64/libblas.so.3 \
/lib64/liblapack.so.3 \
/lib64/liblapacke.so.3 \
/lib64/libboost_chrono.so.1.66.0 \
/lib64/libboost_date_time.so.1.66.0 \
/lib64/libboost_filesystem.so.1.66.0 \
/lib64/libboost_program_options.so.1.66.0 \
/lib64/libboost_serialization.so.1.66.0 \
/lib64/libboost_thread.so.1.66.0 \
/lib64/libboost_system.so.1.66.0 \
/lib64/libboost_unit_test_framework.so.1.66.0 \
/lib64/libboost_atomic.so.1.66.0 \
/lib64/libboost_timer.so.1.66.0 \
/lib64/libboost_regex.so.1.66.0 \
/lib64/libicudata.so.60 \
/lib64/libicui18n.so.60 \
/lib64/libicuuc.so.60 \
/lib64/libboost_chrono.so.1.75.0 \
/lib64/libboost_date_time.so.1.75.0 \
/lib64/libboost_filesystem.so.1.75.0 \
/lib64/libboost_program_options.so.1.75.0 \
/lib64/libboost_serialization.so.1.75.0 \
/lib64/libboost_thread.so.1.75.0 \
/lib64/libboost_system.so.1.75.0 \
/lib64/libboost_unit_test_framework.so.1.75.0 \
/lib64/libboost_atomic.so.1.75.0 \
/lib64/libboost_timer.so.1.75.0 \
/lib64/libboost_regex.so.1.75.0 \
/lib64/libicudata.so.67 \
/lib64/libicui18n.so.67 \
/lib64/libicuuc.so.67 \
/lib64/
docker/Dockerfile.gNB.aw2s.rhel8.2 → docker/Dockerfile.gNB.aw2s.rhel9
+5 -6
View File
@@ -21,7 +21,7 @@
#---------------------------------------------------------------------
#
# Dockerfile for the Open-Air-Interface BUILD service
# Valid for RHEL8
# Valid for RHEL9
#
#---------------------------------------------------------------------
@@ -38,12 +38,11 @@ RUN /bin/sh oaienv && \
ninja aw2sori_transpro
#start from scratch for target executable
FROM registry.access.redhat.com/ubi8/ubi:latest as oai-gnb-aw2s
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-8-codeready-builder" \
RUN dnf update -y && \
dnf install -y \
procps-ng \
libXpm \
libX11 \
@@ -76,7 +75,7 @@ COPY --from=gnb-build \
/usr/local/lib/
COPY --from=gnb-base \
/lib64/libconfig.so.9 \
/lib64/libconfig.so.11 \
/lib64/libforms.so.2 \
/lib64/libblas.so.3 \
/lib64/liblapack.so.3 \
docker/Dockerfile.gNB.rhel8.2 → docker/Dockerfile.gNB.rhel9
+19 -20
View File
@@ -21,7 +21,7 @@
#---------------------------------------------------------------------
#
# Dockerfile for the Open-Air-Interface BUILD service
# Valid for RHEL8
# Valid for RHEL9
#
#---------------------------------------------------------------------
@@ -33,12 +33,11 @@ RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/gnb_parameters
cp /oai-ran/docker/scripts/gnb_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh
#start from scratch for target executable
FROM registry.access.redhat.com/ubi8/ubi:latest as oai-gnb
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-8-codeready-builder" \
RUN dnf update -y && \
dnf install -y \
procps-ng \
libXpm \
libX11 \
@@ -77,25 +76,25 @@ COPY --from=gnb-build \
/usr/local/lib/
COPY --from=gnb-base \
/lib64/libconfig.so.9 \
/lib64/libconfig.so.11 \
/lib64/libforms.so.2 \
/lib64/libblas.so.3 \
/lib64/liblapack.so.3 \
/lib64/liblapacke.so.3 \
/lib64/libboost_chrono.so.1.66.0 \
/lib64/libboost_date_time.so.1.66.0 \
/lib64/libboost_filesystem.so.1.66.0 \
/lib64/libboost_program_options.so.1.66.0 \
/lib64/libboost_serialization.so.1.66.0 \
/lib64/libboost_thread.so.1.66.0 \
/lib64/libboost_system.so.1.66.0 \
/lib64/libboost_unit_test_framework.so.1.66.0 \
/lib64/libboost_atomic.so.1.66.0 \
/lib64/libboost_timer.so.1.66.0 \
/lib64/libboost_regex.so.1.66.0 \
/lib64/libicudata.so.60 \
/lib64/libicui18n.so.60 \
/lib64/libicuuc.so.60 \
/lib64/libboost_chrono.so.1.75.0 \
/lib64/libboost_date_time.so.1.75.0 \
/lib64/libboost_filesystem.so.1.75.0 \
/lib64/libboost_program_options.so.1.75.0 \
/lib64/libboost_serialization.so.1.75.0 \
/lib64/libboost_thread.so.1.75.0 \
/lib64/libboost_system.so.1.75.0 \
/lib64/libboost_unit_test_framework.so.1.75.0 \
/lib64/libboost_atomic.so.1.75.0 \
/lib64/libboost_timer.so.1.75.0 \
/lib64/libboost_regex.so.1.75.0 \
/lib64/libicudata.so.67 \
/lib64/libicui18n.so.67 \
/lib64/libicuuc.so.67 \
/lib64/
# Now we are copying from builder-image the UHD files.
docker/Dockerfile.lteRU.rhel8.2 → docker/Dockerfile.lteRU.rhel9
+16 -16
View File
@@ -21,7 +21,7 @@
#---------------------------------------------------------------------
#
# Dockerfile for the Open-Air-Interface BUILD service
# Valid for RHEL8
# Valid for RHEL9
#
#---------------------------------------------------------------------
@@ -33,11 +33,11 @@ RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/enb_parameters
cp /oai-ran/docker/scripts/lte_ru_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh
#start from scratch for target executable
FROM registry.access.redhat.com/ubi8/ubi:latest as oai-lte-ru
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-8-codeready-builder" \
RUN dnf update -y && \
dnf install -y \
tzdata \
procps-ng \
atlas \
@@ -67,21 +67,21 @@ COPY --from=ru-build \
/usr/local/lib/
COPY --from=ru-base \
/lib64/libconfig.so.9 \
/lib64/libconfig.so.11 \
/lib64/libblas.so.3 \
/lib64/liblapack.so.3 \
/lib64/liblapacke.so.3 \
/lib64/libboost_chrono.so.1.66.0 \
/lib64/libboost_date_time.so.1.66.0 \
/lib64/libboost_filesystem.so.1.66.0 \
/lib64/libboost_program_options.so.1.66.0 \
/lib64/libboost_serialization.so.1.66.0 \
/lib64/libboost_thread.so.1.66.0 \
/lib64/libboost_system.so.1.66.0 \
/lib64/libboost_unit_test_framework.so.1.66.0 \
/lib64/libboost_atomic.so.1.66.0 \
/lib64/libboost_timer.so.1.66.0 \
/lib64/libboost_regex.so.1.66.0 \
/lib64/libboost_chrono.so.1.75.0 \
/lib64/libboost_date_time.so.1.75.0 \
/lib64/libboost_filesystem.so.1.75.0 \
/lib64/libboost_program_options.so.1.75.0 \
/lib64/libboost_serialization.so.1.75.0 \
/lib64/libboost_thread.so.1.75.0 \
/lib64/libboost_system.so.1.75.0 \
/lib64/libboost_unit_test_framework.so.1.75.0 \
/lib64/libboost_atomic.so.1.75.0 \
/lib64/libboost_timer.so.1.75.0 \
/lib64/libboost_regex.so.1.75.0 \
/lib64/
# Copying from the ran-build image the USRP needed packages
docker/Dockerfile.lteUE.rhel8.2 → docker/Dockerfile.lteUE.rhel9
+19 -19
View File
@@ -21,7 +21,7 @@
#---------------------------------------------------------------------
#
# Dockerfile for the Open-Air-Interface BUILD service
# Valid for RHEL8
# Valid for RHEL9
#
#---------------------------------------------------------------------
@@ -34,11 +34,11 @@ RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/lte_ue_paramet
cp /oai-ran/docker/scripts/lte_ue_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh
#start from scratch for target executable
FROM registry.access.redhat.com/ubi8/ubi:latest as oai-lte-ue
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-8-codeready-builder" \
RUN dnf update -y && \
dnf install -y \
lksctp-tools \
procps-ng \
tzdata \
@@ -74,24 +74,24 @@ COPY --from=lte-ue-build \
/usr/local/lib/
COPY --from=lte-ue-base \
/lib64/libconfig.so.9 \
/lib64/libconfig.so.11 \
/lib64/libblas.so.3 \
/lib64/liblapack.so.3 \
/lib64/liblapacke.so.3 \
/lib64/libboost_chrono.so.1.66.0 \
/lib64/libboost_date_time.so.1.66.0 \
/lib64/libboost_filesystem.so.1.66.0 \
/lib64/libboost_program_options.so.1.66.0 \
/lib64/libboost_serialization.so.1.66.0 \
/lib64/libboost_thread.so.1.66.0 \
/lib64/libboost_system.so.1.66.0 \
/lib64/libboost_unit_test_framework.so.1.66.0 \
/lib64/libboost_atomic.so.1.66.0 \
/lib64/libboost_timer.so.1.66.0 \
/lib64/libboost_regex.so.1.66.0 \
/lib64/libicudata.so.60 \
/lib64/libicui18n.so.60 \
/lib64/libicuuc.so.60 \
/lib64/libboost_chrono.so.1.75.0 \
/lib64/libboost_date_time.so.1.75.0 \
/lib64/libboost_filesystem.so.1.75.0 \
/lib64/libboost_program_options.so.1.75.0 \
/lib64/libboost_serialization.so.1.75.0 \
/lib64/libboost_thread.so.1.75.0 \
/lib64/libboost_system.so.1.75.0 \
/lib64/libboost_unit_test_framework.so.1.75.0 \
/lib64/libboost_atomic.so.1.75.0 \
/lib64/libboost_timer.so.1.75.0 \
/lib64/libboost_regex.so.1.75.0 \
/lib64/libicudata.so.67 \
/lib64/libicui18n.so.67 \
/lib64/libicuuc.so.67 \
/lib64/
# Now we are copying from builder-image the UHD files.
docker/Dockerfile.nr-cuup.rhel8.2 → docker/Dockerfile.nr-cuup.rhel9
+4 -4
View File
@@ -21,7 +21,7 @@
#---------------------------------------------------------------------
#
# Dockerfile for the Open-Air-Interface BUILD service
# Valid for RHEL 8.2
# Valid for RHEL 9
#
#---------------------------------------------------------------------
@@ -32,12 +32,12 @@ FROM ran-build:latest AS gnb-build
RUN cp /oai-ran/docker/scripts/gnb_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh
#start from scratch for target executable
FROM registry.access.redhat.com/ubi8/ubi:latest as oai-nr-cuup
FROM registry.access.redhat.com/ubi9/ubi:latest as oai-nr-cuup
ENV TZ=Europe/Paris
RUN yum repolist --disablerepo=* && \
yum update -y && \
yum install -y --enablerepo="ubi-8-codeready-builder" \
yum install -y \
procps-ng \
lksctp-tools \
tzdata \
@@ -59,7 +59,7 @@ COPY --from=gnb-build \
/usr/local/lib/
COPY --from=gnb-base \
/lib64/libconfig.so.9 \
/lib64/libconfig.so.11 \
/lib64/libblas.so.3 \
/lib64/liblapack.so.3 \
/lib64/liblapacke.so.3 \
docker/Dockerfile.nrUE.rhel8.2 → docker/Dockerfile.nrUE.rhel9
+19 -19
View File
@@ -21,7 +21,7 @@
#---------------------------------------------------------------------
#
# Dockerfile for the Open-Air-Interface BUILD service
# Valid for RHEL8
# Valid for RHEL9
#
#---------------------------------------------------------------------
@@ -33,11 +33,11 @@ RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/nr_ue_paramete
cp /oai-ran/docker/scripts/nr_ue_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh
#start from scratch for target executable
FROM registry.access.redhat.com/ubi8/ubi:latest as oai-nr-ue
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-8-codeready-builder" \
RUN dnf update -y && \
dnf install -y \
lksctp-tools \
procps-ng \
tzdata \
@@ -83,25 +83,25 @@ COPY --from=nr-ue-build \
/usr/local/lib/
COPY --from=nr-ue-base \
/lib64/libconfig.so.9 \
/lib64/libconfig.so.11 \
/lib64/libblas.so.3 \
/lib64/liblapack.so.3 \
/lib64/liblapacke.so.3 \
/lib64/libforms.so.2 \
/lib64/libboost_chrono.so.1.66.0 \
/lib64/libboost_date_time.so.1.66.0 \
/lib64/libboost_filesystem.so.1.66.0 \
/lib64/libboost_program_options.so.1.66.0 \
/lib64/libboost_serialization.so.1.66.0 \
/lib64/libboost_thread.so.1.66.0 \
/lib64/libboost_system.so.1.66.0 \
/lib64/libboost_unit_test_framework.so.1.66.0 \
/lib64/libboost_atomic.so.1.66.0 \
/lib64/libboost_timer.so.1.66.0 \
/lib64/libboost_regex.so.1.66.0 \
/lib64/libicudata.so.60 \
/lib64/libicui18n.so.60 \
/lib64/libicuuc.so.60 \
/lib64/libboost_chrono.so.1.75.0 \
/lib64/libboost_date_time.so.1.75.0 \
/lib64/libboost_filesystem.so.1.75.0 \
/lib64/libboost_program_options.so.1.75.0 \
/lib64/libboost_serialization.so.1.75.0 \
/lib64/libboost_thread.so.1.75.0 \
/lib64/libboost_system.so.1.75.0 \
/lib64/libboost_unit_test_framework.so.1.75.0 \
/lib64/libboost_atomic.so.1.75.0 \
/lib64/libboost_timer.so.1.75.0 \
/lib64/libboost_regex.so.1.75.0 \
/lib64/libicudata.so.67 \
/lib64/libicui18n.so.67 \
/lib64/libicuuc.so.67 \
/lib64/
# Now we are copying from builder-image the UHD files.
docker/Dockerfile.phySim.rhel8.2 → docker/Dockerfile.phySim.rhel9
+6 -6
View File
@@ -21,7 +21,7 @@
#---------------------------------------------------------------------
#
# Dockerfile for the Open-Air-Interface BUILD service
# Valid for RHEL8
# Valid for RHEL9
#
#---------------------------------------------------------------------
@@ -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 && \
@@ -41,10 +41,10 @@ RUN /bin/sh oaienv && \
./build_oai --phy_simulators --ninja --verbose-ci --sanitize --noavx512 -c --cmake-opt -DCMAKE_C_FLAGS=-Werror --cmake-opt -DCMAKE_CXX_FLAGS=-Werror --cmake-opt -DCMAKE_C_FLAGS=-Wno-unused-function --cmake-opt -DCMAKE_CXX_FLAGS=-Wno-unused-function
#start from scratch for target executable
FROM registry.access.redhat.com/ubi8/ubi:latest as oai-physim
FROM registry.access.redhat.com/ubi9/ubi:latest as oai-physim
RUN yum update -y && \
yum install -y --enablerepo="ubi-8-codeready-builder" \
RUN dnf update -y && \
dnf install -y \
lksctp-tools \
tzdata \
atlas \
@@ -86,7 +86,7 @@ COPY --from=phy-sim-build \
/lib64/liblapack.so.3 \
/lib64/libexslt.so.0 \
/lib64/libxslt.so.1 \
/usr/lib64/libasan.so.5 \
/usr/lib64/libasan.so.6 \
/usr/lib64/libubsan.so.1 \
/oai-ran/cmake_targets/ran_build/build/libdfts.so \
/oai-ran/cmake_targets/ran_build/build/libldpc.so \
docker/README.md
+5 -5
View File
@@ -34,7 +34,7 @@ For all platforms, the strategy for building docker/podman images is the same:
* Then from the `ran-build` shared image, we can build target images for:
- eNB
- gNB (with UHD)
- gNB (with AW2S), only on RHEL8
- gNB (with AW2S), only on RHEL9
- lte-UE
- nr-UE
@@ -75,7 +75,7 @@ Targets can be:
The currently-supported OS are:
- `rhel8.2` for Red Hat Entreprise Linux (including images for an OpenShift cluster)
- `rhel9` for Red Hat Entreprise Linux (including images for an OpenShift cluster)
- `ubuntu20` for Ubuntu 20.04 LTS
- `rocky` for Rocky-Linux 8.7
@@ -145,9 +145,9 @@ Note that the steps are identical for `rocky-linux`.
Analogous to the above steps:
```
sudo podman build --target ran-base --tag ran-base:latest --file docker/Dockerfile.base.rhel8.2 .
sudo podman build --target ran-build --tag ran-build:latest --file docker/Dockerfile.build.rhel8.2 .
sudo podman build --target oai-enb --tag oai-enb:latest --file docker/Dockerfile.eNB.rhel8.2 .
sudo podman build --target ran-base --tag ran-base:latest --file docker/Dockerfile.base.rhel9 .
sudo podman build --target ran-build --tag ran-build:latest --file docker/Dockerfile.build.rhel9 .
sudo podman build --target oai-enb --tag oai-enb:latest --file docker/Dockerfile.eNB.rhel9 .
```
# 5. Running modems using `docker` under Ubuntu 18.04 #