Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Michael Black
OpenXG-RAN
Commits
89cc4d2d
Commit
89cc4d2d
authored
2 years ago
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/images-u20' into integration_2023_w08
parents
a3685e6b
c093a2cf
Branches unavailable
2023.w22
2023.w21
2023.w20
2023.w19
2023.w18
2023.w18b
2023.w16
2023.w15
2023.w14
2023.w13
2023.w12
2023.w11
2023.w11b
2023.w10
2023.w10b
2023.w09
2023.w08
2023.w08b
No related merge requests found
Changes
35
Hide whitespace changes
Inline
Side-by-side
Showing
35 changed files
with
95 additions
and
88 deletions
+95
-88
ci-scripts/cls_containerize.py
ci-scripts/cls_containerize.py
+2
-2
ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml
ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml
+1
-1
ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml
...ts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml
+1
-1
ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml
...ts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml
+1
-1
ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml
...ts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml
+1
-1
ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml
...ts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml
+1
-1
ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml
ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml
+1
-1
ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml
ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml
+1
-1
ci-scripts/yaml_files/5g_l2sim_tdd/README.md
ci-scripts/yaml_files/5g_l2sim_tdd/README.md
+1
-1
ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml
ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml
+1
-1
ci-scripts/yaml_files/5g_rfsimulator/README.md
ci-scripts/yaml_files/5g_rfsimulator/README.md
+1
-1
ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml
ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml
+1
-1
ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml
...ripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml
+1
-1
ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml
ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml
+1
-1
ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml
ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml
+1
-1
ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml
...ts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml
+1
-1
ci-scripts/yaml_files/fr1_epc_20897/docker-compose.yml
ci-scripts/yaml_files/fr1_epc_20897/docker-compose.yml
+1
-1
ci-scripts/yaml_files/magma_nsa_20897/docker-compose.yml
ci-scripts/yaml_files/magma_nsa_20897/docker-compose.yml
+1
-1
cmake_targets/tools/build_helper
cmake_targets/tools/build_helper
+2
-1
docker/Dockerfile.base.rhel8.2
docker/Dockerfile.base.rhel8.2
+1
-1
docker/Dockerfile.base.ubuntu20
docker/Dockerfile.base.ubuntu20
+3
-3
docker/Dockerfile.build.rhel8.2
docker/Dockerfile.build.rhel8.2
+1
-1
docker/Dockerfile.build.ubuntu20
docker/Dockerfile.build.ubuntu20
+1
-1
docker/Dockerfile.eNB.rhel8.2
docker/Dockerfile.eNB.rhel8.2
+1
-1
docker/Dockerfile.eNB.ubuntu20
docker/Dockerfile.eNB.ubuntu20
+11
-10
docker/Dockerfile.gNB.rhel8.2
docker/Dockerfile.gNB.rhel8.2
+1
-1
docker/Dockerfile.gNB.ubuntu20
docker/Dockerfile.gNB.ubuntu20
+11
-10
docker/Dockerfile.lteRU.rhel8.2
docker/Dockerfile.lteRU.rhel8.2
+1
-1
docker/Dockerfile.lteRU.ubuntu20
docker/Dockerfile.lteRU.ubuntu20
+10
-9
docker/Dockerfile.lteUE.rhel8.2
docker/Dockerfile.lteUE.rhel8.2
+1
-1
docker/Dockerfile.lteUE.ubuntu20
docker/Dockerfile.lteUE.ubuntu20
+11
-10
docker/Dockerfile.nr-cuup.ubuntu20
docker/Dockerfile.nr-cuup.ubuntu20
+2
-2
docker/Dockerfile.nrUE.rhel8.2
docker/Dockerfile.nrUE.rhel8.2
+1
-1
docker/Dockerfile.nrUE.ubuntu20
docker/Dockerfile.nrUE.ubuntu20
+11
-10
docker/README.md
docker/README.md
+7
-6
No files found.
ci-scripts/cls_containerize.py
View file @
89cc4d2d
...
...
@@ -187,7 +187,7 @@ def AnalyzeIperf(cliOptions, clientReport, serverReport):
reportLine
=
clientReportLines
[
l
+
1
]
logging
.
debug
(
f'found server report: "
{
reportLine
}
"'
)
statusTemplate
=
'(?:|\[ *\d+\].*) +0\.0-\s*(?P<duration>[0-9\.]+) +sec +[0-9\.]+ [kKMG]Bytes +(?P<bitrate>[0-9\.]+) (?P<magnitude>[kKMG])bits\/sec +(?P<jitter>[0-9\.]+) ms +(\d+\/
..
\d+) +(\((?P<packetloss>[0-9\.]+)%\))'
statusTemplate
=
'(?:|\[ *\d+\].*) +0\.0-\s*(?P<duration>[0-9\.]+) +sec +[0-9\.]+ [kKMG]Bytes +(?P<bitrate>[0-9\.]+) (?P<magnitude>[kKMG])bits\/sec +(?P<jitter>[0-9\.]+) ms +(\d+\/
*
\d+) +(\((?P<packetloss>[0-9\.]+)%\))'
# if we do not find a server report in the client logs, check the server logs
# and use the last line which is typically close/identical to server report
if
reportLine
is
None
:
...
...
@@ -345,7 +345,7 @@ class Containerize():
self
.
host
=
result
.
group
(
0
)
if
self
.
host
==
'Ubuntu'
:
self
.
cli
=
'docker'
self
.
dockerfileprefix
=
'.ubuntu
18
'
self
.
dockerfileprefix
=
'.ubuntu
20
'
self
.
cliBuildOptions
=
'--no-cache'
elif
self
.
host
==
'Red Hat'
:
self
.
cli
=
'sudo podman'
...
...
This diff is collapsed.
Click to expand it.
ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml
View file @
89cc4d2d
...
...
@@ -166,7 +166,7 @@ services:
retries
:
5
trf_gen
:
image
:
trf-gen:production
image
:
oaisoftwarealliance/trf-gen-cn5g:focal
privileged
:
true
container_name
:
l2sim4g-trf-gen
networks
:
...
...
This diff is collapsed.
Click to expand it.
ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml
View file @
89cc4d2d
...
...
@@ -166,7 +166,7 @@ services:
retries
:
5
trf_gen
:
image
:
trf-gen:production
image
:
oaisoftwarealliance/trf-gen-cn5g:focal
privileged
:
true
container_name
:
rfsim4g-trf-gen
networks
:
...
...
This diff is collapsed.
Click to expand it.
ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml
View file @
89cc4d2d
...
...
@@ -166,7 +166,7 @@ services:
retries
:
5
trf_gen
:
image
:
trf-gen:production
image
:
oaisoftwarealliance/trf-gen-cn5g:focal
privileged
:
true
container_name
:
rfsim4g-trf-gen
networks
:
...
...
This diff is collapsed.
Click to expand it.
ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml
View file @
89cc4d2d
...
...
@@ -166,7 +166,7 @@ services:
retries
:
5
trf_gen
:
image
:
trf-gen:production
image
:
oaisoftwarealliance/trf-gen-cn5g:focal
privileged
:
true
container_name
:
rfsim4g-trf-gen
networks
:
...
...
This diff is collapsed.
Click to expand it.
ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml
View file @
89cc4d2d
...
...
@@ -166,7 +166,7 @@ services:
retries
:
5
trf_gen
:
image
:
trf-gen:production
image
:
oaisoftwarealliance/trf-gen-cn5g:focal
privileged
:
true
container_name
:
rfsim4g-trf-gen
networks
:
...
...
This diff is collapsed.
Click to expand it.
ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml
View file @
89cc4d2d
...
...
@@ -148,7 +148,7 @@ services:
oai-ext-dn
:
privileged
:
true
container_name
:
rfsim5g-oai-ext-dn
image
:
oaisoftwarealliance/trf-gen-cn5g:
latest
image
:
oaisoftwarealliance/trf-gen-cn5g:
focal
entrypoint
:
/bin/bash -c \
"iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
"ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
...
...
This diff is collapsed.
Click to expand it.
ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml
View file @
89cc4d2d
...
...
@@ -148,7 +148,7 @@ services:
oai-ext-dn
:
privileged
:
true
container_name
:
rfsim5g-oai-ext-dn
image
:
oaisoftwarealliance/trf-gen-cn5g:
latest
image
:
oaisoftwarealliance/trf-gen-cn5g:
focal
entrypoint
:
/bin/bash -c \
"iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
"ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
...
...
This diff is collapsed.
Click to expand it.
ci-scripts/yaml_files/5g_l2sim_tdd/README.md
View file @
89cc4d2d
...
...
@@ -37,7 +37,7 @@ $ docker pull oaisoftwarealliance/oai-amf:v1.5.0
$
docker pull oaisoftwarealliance/oai-nrf:v1.5.0
$
docker pull oaisoftwarealliance/oai-smf:v1.5.0
$
docker pull oaisoftwarealliance/oai-spgwu-tiny:v1.5.0
$
docker pull oaisoftwarealliance/trf-gen-cn5g:
latest
$
docker pull oaisoftwarealliance/trf-gen-cn5g:
focal
$
docker pull oaisoftwarealliance/oai-gnb:develop
$
docker pull oaisoftwarealliance/oai-nr-ue:develop
...
...
This diff is collapsed.
Click to expand it.
ci-scripts/yaml_files/5g_l2sim_tdd/docker-compose.yaml
View file @
89cc4d2d
...
...
@@ -148,7 +148,7 @@ services:
oai-ext-dn
:
privileged
:
true
container_name
:
"
l2sim-oai-ext-dn"
image
:
oaisoftwarealliance/trf-gen-cn5g:
latest
image
:
oaisoftwarealliance/trf-gen-cn5g:
focal
entrypoint
:
/bin/bash -c \
"iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
"ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
...
...
This diff is collapsed.
Click to expand it.
ci-scripts/yaml_files/5g_rfsimulator/README.md
View file @
89cc4d2d
...
...
@@ -41,7 +41,7 @@ $ docker pull oaisoftwarealliance/oai-amf:v1.5.0
$
docker pull oaisoftwarealliance/oai-nrf:v1.5.0
$
docker pull oaisoftwarealliance/oai-smf:v1.5.0
$
docker pull oaisoftwarealliance/oai-spgwu-tiny:v1.5.0
$
docker pull oaisoftwarealliance/trf-gen-cn5g:
latest
$
docker pull oaisoftwarealliance/trf-gen-cn5g:
focal
$
docker pull oaisoftwarealliance/oai-gnb:develop
$
docker pull oaisoftwarealliance/oai-nr-ue:develop
...
...
This diff is collapsed.
Click to expand it.
ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml
View file @
89cc4d2d
...
...
@@ -148,7 +148,7 @@ services:
oai-ext-dn
:
privileged
:
true
container_name
:
rfsim5g-oai-ext-dn
image
:
oaisoftwarealliance/trf-gen-cn5g:
latest
image
:
oaisoftwarealliance/trf-gen-cn5g:
focal
entrypoint
:
/bin/bash -c \
"iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
"ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
...
...
This diff is collapsed.
Click to expand it.
ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml
View file @
89cc4d2d
...
...
@@ -148,7 +148,7 @@ services:
oai-ext-dn
:
privileged
:
true
container_name
:
rfsim5g-oai-ext-dn
image
:
oaisoftwarealliance/trf-gen-cn5g:
latest
image
:
oaisoftwarealliance/trf-gen-cn5g:
focal
entrypoint
:
/bin/bash -c \
"iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
"ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
...
...
This diff is collapsed.
Click to expand it.
ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml
View file @
89cc4d2d
...
...
@@ -148,7 +148,7 @@ services:
oai-ext-dn
:
privileged
:
true
container_name
:
rfsim5g-oai-ext-dn
image
:
oaisoftwarealliance/trf-gen-cn5g:
latest
image
:
oaisoftwarealliance/trf-gen-cn5g:
focal
entrypoint
:
/bin/bash -c \
"iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
"ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
...
...
This diff is collapsed.
Click to expand it.
ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml
View file @
89cc4d2d
...
...
@@ -149,7 +149,7 @@ services:
oai-ext-dn
:
privileged
:
true
container_name
:
rfsim5g-oai-ext-dn
image
:
oaisoftwarealliance/trf-gen-cn5g:
latest
image
:
oaisoftwarealliance/trf-gen-cn5g:
focal
entrypoint
:
/bin/bash -c \
"iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
"ip route add 12.1.1.0/24 via 192.168.73.134 dev eth0; sleep infinity"
...
...
This diff is collapsed.
Click to expand it.
ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml
View file @
89cc4d2d
...
...
@@ -148,7 +148,7 @@ services:
oai-ext-dn
:
privileged
:
true
container_name
:
rfsim5g-oai-ext-dn
image
:
oaisoftwarealliance/trf-gen-cn5g:
latest
image
:
oaisoftwarealliance/trf-gen-cn5g:
focal
entrypoint
:
/bin/bash -c \
"iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
"ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
...
...
This diff is collapsed.
Click to expand it.
ci-scripts/yaml_files/fr1_epc_20897/docker-compose.yml
View file @
89cc4d2d
...
...
@@ -184,7 +184,7 @@ services:
retries
:
5
trf_gen
:
image
:
trf-gen:production
image
:
oaisoftwarealliance/trf-gen-cn5g:focal
privileged
:
true
container_name
:
prod-trf-gen
networks
:
...
...
This diff is collapsed.
Click to expand it.
ci-scripts/yaml_files/magma_nsa_20897/docker-compose.yml
View file @
89cc4d2d
...
...
@@ -168,7 +168,7 @@ services:
retries
:
5
trf_gen
:
image
:
trf-gen:production
image
:
oaisoftwarealliance/trf-gen-cn5g:focal
privileged
:
true
container_name
:
prod-trf-gen
networks
:
...
...
This diff is collapsed.
Click to expand it.
cmake_targets/tools/build_helper
View file @
89cc4d2d
...
...
@@ -274,6 +274,7 @@ install_usrp_uhd_driver_from_source(){
# - 4.2.0.0
# - 4.2.0.1
# - 4.3.0.0-rc1
# - 4.4.0.0
git apply $OPENAIR_DIR/cmake_targets/tools/uhd-4.x-tdd-patch.diff
ret=$?;[[ $ret -ne 0 ]] && echo_fatal "Could not apply the TDD patch"
fi
...
...
@@ -349,7 +350,7 @@ check_install_usrp_uhd_driver(){
$SUDO apt-get -y install python-tk $boost_libs_ubuntu libusb-1.0-0-dev
case "$(get_distribution_release)" in
"ubuntu18.04" | "ubuntu20.04" | "ubuntu22.04")
$SUDO apt-get -y install libuhd-dev libuhd4.
2
.0 uhd-host
$SUDO apt-get -y install libuhd-dev libuhd4.
4
.0 uhd-host
;;
esac
elif [[ "$OS_BASEDISTRO" == "fedora" ]]; then
...
...
This diff is collapsed.
Click to expand it.
docker/Dockerfile.base.rhel8.2
View file @
89cc4d2d
...
...
@@ -30,7 +30,7 @@ FROM registry.access.redhat.com/ubi8/ubi:latest AS ran-base
ARG NEEDED_GIT_PROXY
ENV TZ=Europe/Paris
ENV BUILD_UHD_FROM_SOURCE=True
ENV UHD_VERSION=
3.15
.0.0
ENV UHD_VERSION=
4.4
.0.0
# Copy the entitlements
COPY ./etc-pki-entitlement /etc/pki/entitlement
...
...
This diff is collapsed.
Click to expand it.
docker/Dockerfile.base.ubuntu
18
→
docker/Dockerfile.base.ubuntu
20
View file @
89cc4d2d
...
...
@@ -21,17 +21,17 @@
#---------------------------------------------------------------------
#
# Dockerfile for the Open-Air-Interface BUILD service
# Valid for Ubuntu
18
.04
# Valid for Ubuntu
20
.04
#
#---------------------------------------------------------------------
FROM ubuntu:
bionic
AS ran-base
FROM ubuntu:
focal
AS ran-base
ARG NEEDED_GIT_PROXY
ENV DEBIAN_FRONTEND=noninteractive
ENV TZ=Europe/Paris
ENV BUILD_UHD_FROM_SOURCE=True
ENV UHD_VERSION=
3.15
.0.0
ENV UHD_VERSION=
4.4
.0.0
#install developers pkg/repo
RUN apt-get update && \
...
...
This diff is collapsed.
Click to expand it.
docker/Dockerfile.build.rhel8.2
View file @
89cc4d2d
...
...
@@ -21,7 +21,7 @@
#---------------------------------------------------------------------
#
# Dockerfile for the Open-Air-Interface BUILD service
# Valid for
Ubuntu 18.04
# Valid for
RHEL8
#
#---------------------------------------------------------------------
...
...
This diff is collapsed.
Click to expand it.
docker/Dockerfile.build.ubuntu
18
→
docker/Dockerfile.build.ubuntu
20
View file @
89cc4d2d
...
...
@@ -21,7 +21,7 @@
#---------------------------------------------------------------------
#
# Dockerfile for the Open-Air-Interface BUILD service
# Valid for Ubuntu
18
.04
# Valid for Ubuntu
20
.04
#
#---------------------------------------------------------------------
...
...
This diff is collapsed.
Click to expand it.
docker/Dockerfile.eNB.rhel8.2
View file @
89cc4d2d
...
...
@@ -95,7 +95,7 @@ COPY --from=enb-base \
# Now we are copying from builder-image the UHD files.
COPY --from=enb-base /usr/local/bin/uhd_find_devices /usr/local/bin
COPY --from=enb-base /usr/local/lib64/libuhd.so.
3.15
.0 /usr/local/lib64
COPY --from=enb-base /usr/local/lib64/libuhd.so.
4.4
.0 /usr/local/lib64
COPY --from=enb-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-enb/bin
WORKDIR /usr/local/share/uhd/rfnoc
...
...
This diff is collapsed.
Click to expand it.
docker/Dockerfile.eNB.ubuntu
18
→
docker/Dockerfile.eNB.ubuntu
20
View file @
89cc4d2d
...
...
@@ -21,7 +21,7 @@
#---------------------------------------------------------------------
#
# Dockerfile for the Open-Air-Interface BUILD service
# Valid for Ubuntu
18
.04
# Valid for Ubuntu
20
.04
#
#---------------------------------------------------------------------
...
...
@@ -33,7 +33,7 @@ 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 ubuntu:
bionic
as oai-enb
FROM ubuntu:
focal
as oai-enb
ENV DEBIAN_FRONTEND=noninteractive
ENV TZ=Europe/Paris
...
...
@@ -81,16 +81,17 @@ COPY --from=enb-build \
# Now we are copying from builder-image the UHD files.
COPY --from=enb-base /usr/local/bin/uhd_find_devices /usr/local/bin
COPY --from=enb-base /usr/local/lib/libuhd.so.
3.15
.0 /usr/local/lib
COPY --from=enb-base /usr/local/lib/libuhd.so.
4.4
.0 /usr/local/lib
COPY --from=enb-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-enb/bin
COPY --from=enb-base \
/usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.65.1 \
/usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.65.1 \
/usr/lib/x86_64-linux-gnu/libboost_regex.so.1.65.1 \
/usr/lib/x86_64-linux-gnu/libboost_serialization.so.1.65.1 \
/usr/lib/x86_64-linux-gnu/libboost_thread.so.1.65.1 \
/usr/lib/x86_64-linux-gnu/libboost_system.so.1.65.1 \
/usr/lib/x86_64-linux-gnu/libboost_program_options.so.1.65.1 \
/usr/lib/x86_64-linux-gnu/libboost_chrono.so.1.71.0 \
/usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.71.0 \
/usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.71.0 \
/usr/lib/x86_64-linux-gnu/libboost_regex.so.1.71.0 \
/usr/lib/x86_64-linux-gnu/libboost_serialization.so.1.71.0 \
/usr/lib/x86_64-linux-gnu/libboost_thread.so.1.71.0 \
/usr/lib/x86_64-linux-gnu/libboost_system.so.1.71.0 \
/usr/lib/x86_64-linux-gnu/libboost_program_options.so.1.71.0 \
/usr/lib/x86_64-linux-gnu/
RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \
...
...
This diff is collapsed.
Click to expand it.
docker/Dockerfile.gNB.rhel8.2
View file @
89cc4d2d
...
...
@@ -99,7 +99,7 @@ COPY --from=gnb-base \
# Now we are copying from builder-image the UHD files.
COPY --from=gnb-base /usr/local/bin/uhd_find_devices /usr/local/bin
COPY --from=gnb-base /usr/local/lib64/libuhd.so.
3.15
.0 /usr/local/lib64
COPY --from=gnb-base /usr/local/lib64/libuhd.so.
4.4
.0 /usr/local/lib64
COPY --from=gnb-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-gnb/bin
WORKDIR /usr/local/share/uhd/rfnoc
...
...
This diff is collapsed.
Click to expand it.
docker/Dockerfile.gNB.ubuntu
18
→
docker/Dockerfile.gNB.ubuntu
20
View file @
89cc4d2d
...
...
@@ -21,7 +21,7 @@
#---------------------------------------------------------------------
#
# Dockerfile for the Open-Air-Interface BUILD service
# Valid for Ubuntu
18
.04
# Valid for Ubuntu
20
.04
#
#---------------------------------------------------------------------
...
...
@@ -33,7 +33,7 @@ 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 ubuntu:
bionic
as oai-gnb
FROM ubuntu:
focal
as oai-gnb
ENV DEBIAN_FRONTEND=noninteractive
ENV TZ=Europe
...
...
@@ -82,16 +82,17 @@ COPY --from=gnb-build \
# Now we are copying from builder-image the UHD files.
COPY --from=gnb-base /usr/local/bin/uhd_find_devices /usr/local/bin
COPY --from=gnb-base /usr/local/lib/libuhd.so.
3.15
.0 /usr/local/lib
COPY --from=gnb-base /usr/local/lib/libuhd.so.
4.4
.0 /usr/local/lib
COPY --from=gnb-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-gnb/bin
COPY --from=gnb-base \
/usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.65.1 \
/usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.65.1 \
/usr/lib/x86_64-linux-gnu/libboost_regex.so.1.65.1 \
/usr/lib/x86_64-linux-gnu/libboost_serialization.so.1.65.1 \
/usr/lib/x86_64-linux-gnu/libboost_thread.so.1.65.1 \
/usr/lib/x86_64-linux-gnu/libboost_system.so.1.65.1 \
/usr/lib/x86_64-linux-gnu/libboost_program_options.so.1.65.1 \
/usr/lib/x86_64-linux-gnu/libboost_chrono.so.1.71.0 \
/usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.71.0 \
/usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.71.0 \
/usr/lib/x86_64-linux-gnu/libboost_regex.so.1.71.0 \
/usr/lib/x86_64-linux-gnu/libboost_serialization.so.1.71.0 \
/usr/lib/x86_64-linux-gnu/libboost_thread.so.1.71.0 \
/usr/lib/x86_64-linux-gnu/libboost_system.so.1.71.0 \
/usr/lib/x86_64-linux-gnu/libboost_program_options.so.1.71.0 \
/usr/lib/x86_64-linux-gnu/
RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \
...
...
This diff is collapsed.
Click to expand it.
docker/Dockerfile.lteRU.rhel8.2
View file @
89cc4d2d
...
...
@@ -86,7 +86,7 @@ COPY --from=ru-base \
# Copying from the ran-build image the USRP needed packages
COPY --from=ru-base /usr/local/bin/uhd_find_devices /usr/local/bin
COPY --from=ru-base /usr/local/lib64/libuhd.so.
3.15
.0 /usr/local/lib64
COPY --from=ru-base /usr/local/lib64/libuhd.so.
4.4
.0 /usr/local/lib64
COPY --from=ru-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-lte-ru/bin
WORKDIR /usr/local/share/uhd/rfnoc
...
...
This diff is collapsed.
Click to expand it.
docker/Dockerfile.lteRU.ubuntu
18
→
docker/Dockerfile.lteRU.ubuntu
20
View file @
89cc4d2d
...
...
@@ -21,7 +21,7 @@
#---------------------------------------------------------------------
#
# Dockerfile for the Open-Air-Interface BUILD service
# Valid for Ubuntu
18
.04
# Valid for Ubuntu
20
.04
#
#---------------------------------------------------------------------
...
...
@@ -33,7 +33,7 @@ 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 ubuntu:
bionic
as oai-lte-ru
FROM ubuntu:
focal
as oai-lte-ru
ENV DEBIAN_FRONTEND=noninteractive
ENV TZ=Europe/Paris
...
...
@@ -73,16 +73,17 @@ COPY --from=ru-build \
# Now we are copying from builder-image the UHD files.
COPY --from=ru-base /usr/local/bin/uhd_find_devices /usr/local/bin
COPY --from=ru-base /usr/local/lib/libuhd.so.
3.15
.0 /usr/local/lib
COPY --from=ru-base /usr/local/lib/libuhd.so.
4.4
.0 /usr/local/lib
COPY --from=ru-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-lte-ru/bin
COPY --from=ru-base \
/usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.65.1 \
/usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.65.1 \
/usr/lib/x86_64-linux-gnu/libboost_regex.so.1.65.1 \
/usr/lib/x86_64-linux-gnu/libboost_serialization.so.1.65.1 \
/usr/lib/x86_64-linux-gnu/libboost_thread.so.1.65.1 \
/usr/lib/x86_64-linux-gnu/libboost_system.so.1.65.1 \
/usr/lib/x86_64-linux-gnu/libboost_chrono.so.1.71.0 \
/usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.71.0 \
/usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.71.0 \
/usr/lib/x86_64-linux-gnu/libboost_regex.so.1.71.0 \
/usr/lib/x86_64-linux-gnu/libboost_serialization.so.1.71.0 \
/usr/lib/x86_64-linux-gnu/libboost_thread.so.1.71.0 \
/usr/lib/x86_64-linux-gnu/libboost_system.so.1.71.0 \
/usr/lib/x86_64-linux-gnu/
RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \
...
...
This diff is collapsed.
Click to expand it.
docker/Dockerfile.lteUE.rhel8.2
View file @
89cc4d2d
...
...
@@ -96,7 +96,7 @@ COPY --from=lte-ue-base \
# Now we are copying from builder-image the UHD files.
COPY --from=lte-ue-base /usr/local/bin/uhd_find_devices /usr/local/bin
COPY --from=lte-ue-base /usr/local/lib64/libuhd.so.
3.15
.0 /usr/local/lib64
COPY --from=lte-ue-base /usr/local/lib64/libuhd.so.
4.4
.0 /usr/local/lib64
COPY --from=lte-ue-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-lte-ue/bin
WORKDIR /usr/local/share/uhd/rfnoc
...
...
This diff is collapsed.
Click to expand it.
docker/Dockerfile.lteUE.ubuntu
18
→
docker/Dockerfile.lteUE.ubuntu
20
View file @
89cc4d2d
...
...
@@ -21,7 +21,7 @@
#---------------------------------------------------------------------
#
# Dockerfile for the Open-Air-Interface BUILD service
# Valid for Ubuntu
18
.04
# Valid for Ubuntu
20
.04
#
#---------------------------------------------------------------------
...
...
@@ -34,7 +34,7 @@ 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 ubuntu:
bionic
as oai-lte-ue
FROM ubuntu:
focal
as oai-lte-ue
ENV DEBIAN_FRONTEND=noninteractive
ENV TZ=Europe/Paris
...
...
@@ -81,17 +81,18 @@ COPY --from=lte-ue-build \
# Now we are copying from builder-image the UHD files.
COPY --from=lte-ue-base /usr/local/bin/uhd_find_devices /usr/local/bin
COPY --from=lte-ue-base /usr/local/lib/libuhd.so.
3.15
.0 /usr/local/lib
COPY --from=lte-ue-base /usr/local/lib/libuhd.so.
4.4
.0 /usr/local/lib
COPY --from=lte-ue-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-lte-ue/bin
COPY --from=lte-ue-base \
/usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.65.1 \
/usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.65.1 \
/usr/lib/x86_64-linux-gnu/libboost_regex.so.1.65.1 \
/usr/lib/x86_64-linux-gnu/libboost_serialization.so.1.65.1 \
/usr/lib/x86_64-linux-gnu/libboost_thread.so.1.65.1 \
/usr/lib/x86_64-linux-gnu/libboost_system.so.1.65.1 \
/usr/lib/x86_64-linux-gnu/libboost_program_options.so.1.65.1 \
/usr/lib/x86_64-linux-gnu/libboost_chrono.so.1.71.0 \
/usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.71.0 \
/usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.71.0 \
/usr/lib/x86_64-linux-gnu/libboost_regex.so.1.71.0 \
/usr/lib/x86_64-linux-gnu/libboost_serialization.so.1.71.0 \
/usr/lib/x86_64-linux-gnu/libboost_thread.so.1.71.0 \
/usr/lib/x86_64-linux-gnu/libboost_system.so.1.71.0 \
/usr/lib/x86_64-linux-gnu/libboost_program_options.so.1.71.0 \
/usr/lib/x86_64-linux-gnu/
RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \
...
...
This diff is collapsed.
Click to expand it.
docker/Dockerfile.nr-cuup.ubuntu
18
→
docker/Dockerfile.nr-cuup.ubuntu
20
View file @
89cc4d2d
...
...
@@ -21,7 +21,7 @@
#---------------------------------------------------------------------
#
# Dockerfile for the Open-Air-Interface BUILD service
# Valid for Ubuntu
18
.04
# Valid for Ubuntu
20
.04
#
#---------------------------------------------------------------------
...
...
@@ -31,7 +31,7 @@ FROM ran-build:latest AS gnb-build
RUN cp /oai-ran/docker/scripts/gnb_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh
FROM ubuntu:
bionic
as oai-nr-cuup
FROM ubuntu:
focal
as oai-nr-cuup
ENV DEBIAN_FRONTEND=noninteractive
ENV TZ=Europe
...
...
This diff is collapsed.
Click to expand it.
docker/Dockerfile.nrUE.rhel8.2
View file @
89cc4d2d
...
...
@@ -106,7 +106,7 @@ COPY --from=nr-ue-base \
# Now we are copying from builder-image the UHD files.
COPY --from=nr-ue-base /usr/local/bin/uhd_find_devices /usr/local/bin
COPY --from=nr-ue-base /usr/local/lib64/libuhd.so.
3.15
.0 /usr/local/lib64
COPY --from=nr-ue-base /usr/local/lib64/libuhd.so.
4.4
.0 /usr/local/lib64
COPY --from=nr-ue-base /usr/local/lib64/uhd/utils/uhd_images_downloader.py /opt/oai-nr-ue/bin
WORKDIR /usr/local/share/uhd/rfnoc
...
...
This diff is collapsed.
Click to expand it.
docker/Dockerfile.nrUE.ubuntu
18
→
docker/Dockerfile.nrUE.ubuntu
20
View file @
89cc4d2d
...
...
@@ -21,7 +21,7 @@
#---------------------------------------------------------------------
#
# Dockerfile for the Open-Air-Interface BUILD service
# Valid for Ubuntu
18
.04
# Valid for Ubuntu
20
.04
#
#---------------------------------------------------------------------
...
...
@@ -33,7 +33,7 @@ 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 ubuntu:
bionic
as oai-nr-ue
FROM ubuntu:
focal
as oai-nr-ue
ENV DEBIAN_FRONTEND=noninteractive
ENV TZ=Europe/Paris
...
...
@@ -89,17 +89,18 @@ COPY --from=nr-ue-build \
# Now we are copying from builder-image the UHD files.
COPY --from=nr-ue-base /usr/local/bin/uhd_find_devices /usr/local/bin
COPY --from=nr-ue-base /usr/local/lib/libuhd.so.
3.15
.0 /usr/local/lib
COPY --from=nr-ue-base /usr/local/lib/libuhd.so.
4.4
.0 /usr/local/lib
COPY --from=nr-ue-base /usr/local/lib/uhd/utils/uhd_images_downloader.py /opt/oai-nr-ue/bin
COPY --from=nr-ue-base \
/usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.65.1 \
/usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.65.1 \
/usr/lib/x86_64-linux-gnu/libboost_regex.so.1.65.1 \
/usr/lib/x86_64-linux-gnu/libboost_serialization.so.1.65.1 \
/usr/lib/x86_64-linux-gnu/libboost_thread.so.1.65.1 \
/usr/lib/x86_64-linux-gnu/libboost_system.so.1.65.1 \
/usr/lib/x86_64-linux-gnu/libboost_program_options.so.1.65.1 \
/usr/lib/x86_64-linux-gnu/libboost_chrono.so.1.71.0 \
/usr/lib/x86_64-linux-gnu/libboost_date_time.so.1.71.0 \
/usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.71.0 \
/usr/lib/x86_64-linux-gnu/libboost_regex.so.1.71.0 \
/usr/lib/x86_64-linux-gnu/libboost_serialization.so.1.71.0 \
/usr/lib/x86_64-linux-gnu/libboost_thread.so.1.71.0 \
/usr/lib/x86_64-linux-gnu/libboost_system.so.1.71.0 \
/usr/lib/x86_64-linux-gnu/libboost_program_options.so.1.71.0 \
/usr/lib/x86_64-linux-gnu/
RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \
...
...
This diff is collapsed.
Click to expand it.
docker/README.md
View file @
89cc4d2d
...
...
@@ -68,6 +68,7 @@ Targets can be:
-
`build`
for an image named
`ran-build`
(shared image)
-
`eNB`
for an image named
`oai-enb`
-
`gNB`
for an image named
`oai-gnb`
-
`nr-cuup`
for an image named
`oai-nr-cuup`
-
`gNB.aw2s`
for an image named
`oai-gnb-aw2s`
-
`lteUE`
for an image named
`oai-lte-ue`
-
`nrUE`
for an image named
`oai-nr-ue`
...
...
@@ -75,17 +76,17 @@ Targets can be:
The currently-supported OS are:
-
`rhel8.2`
for Red Hat Entreprise Linux (including images for an OpenShift cluster)
-
`ubuntu
18`
for Ubuntu 18
.04 LTS
-
`ubuntu
20`
for Ubuntu 20
.04 LTS
For more details regarding the build on an Openshift Cluster, see
[
OpenShift README
](
../openshift/README.md
)
.
# 3. Building using `docker` under Ubuntu
18
.04 #
# 3. Building using `docker` under Ubuntu
20
.04 #
## 3.1. Pre-requisites ##
*
`git`
installed
*
`docker-ce`
installed
*
Pulling
`ubuntu:
bionic
`
from DockerHub
*
Pulling
`ubuntu:
focal
`
from DockerHub
## 3.2. Building the shared images ##
...
...
@@ -95,8 +96,8 @@ There are two shared images: one that has all dependencies, and a second that co
git clone https://gitlab.eurecom.fr/oai/openairinterface5g.git
cd
openairinterface5g
git checkout develop
docker build
--target
ran-base
--tag
ran-base:latest
--file
docker/Dockerfile.base.ubuntu
18
.
docker build
--target
ran-build
--tag
ran-build:latest
--file
docker/Dockerfile.build.ubuntu
18
.
docker build
--target
ran-base
--tag
ran-base:latest
--file
docker/Dockerfile.base.ubuntu
20
.
docker build
--target
ran-build
--tag
ran-build:latest
--file
docker/Dockerfile.build.ubuntu
20
.
```
After building both:
...
...
@@ -115,7 +116,7 @@ ran-base latest 5c9c02a5b4a8 1 minute ago
For example, the eNB:
```
bash
docker build
--target
oai-enb
--tag
oai-enb:latest
--file
docker/Dockerfile.eNB.ubuntu
18
.
docker build
--target
oai-enb
--tag
oai-enb:latest
--file
docker/Dockerfile.eNB.ubuntu
20
.
```
After a while:
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment