yigid/openairinterface5g
1
0
Fork 0
mirror of https://gitlab.eurecom.fr/oai/openairinterface5g.git synced 2026-07-13 04:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/update-cn5g' into integration_2026_w19 (!4103)

Browse Source 
Update CN5G images to stable release `v2.2.1`

- Updated CN5G image tags to a stable release v2.2.1
- Upgrade MySQL image to 9.6
- Updated image oaisoftwarealliance/trf-gen-cn5g to latest tag
  supporting multi-architecture platforms

Signed-off-by: Jaroslava Fiedlerova <jaroslava.fiedlerova@openairinterface.org>
Reviewed-by: Jaroslava Fiedlerova <jaroslava.fiedlerova@openairinterface.org>
This commit is contained in:
Jaroslava Fiedlerova
2026-05-07 10:07:36 +02:00
parent b11cf166af e95992927c
commit 73d2b9c7e2
7 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ci-scripts/yaml_files/5g_zmq_radio_1x1_ocudu/docker-compose.yaml
View File

@@ -3,7 +3,7 @@
services: services:
mysql: mysql:
container_name: "rfsim5g-mysql" container_name: "rfsim5g-mysql"
image: mysql:8.0 image: mysql:9.6
init: true init: true
volumes: volumes:
- ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
@@ -26,7 +26,7 @@ services:
ipv4_address: 192.168.71.131 ipv4_address: 192.168.71.131
oai-amf: oai-amf:
container_name: "rfsim5g-oai-amf" container_name: "rfsim5g-oai-amf"
image: oaisoftwarealliance/oai-amf:v2.1.10 image: oaisoftwarealliance/oai-amf:v2.2.1
environment: environment:
- TZ=Europe/paris - TZ=Europe/paris
volumes: volumes:
@@ -38,7 +38,7 @@ services:
ipv4_address: 192.168.71.132 ipv4_address: 192.168.71.132
oai-smf: oai-smf:
container_name: "rfsim5g-oai-smf" container_name: "rfsim5g-oai-smf"
image: oaisoftwarealliance/oai-smf:v2.1.10 image: oaisoftwarealliance/oai-smf:v2.2.1
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
volumes: volumes:
@@ -50,7 +50,7 @@ services:
ipv4_address: 192.168.71.133 ipv4_address: 192.168.71.133
oai-upf: oai-upf:
container_name: "rfsim5g-oai-upf" container_name: "rfsim5g-oai-upf"
image: oaisoftwarealliance/oai-upf:v2.1.10 image: oaisoftwarealliance/oai-upf:v2.2.1
init: true init: true
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
@@ -74,7 +74,7 @@ services:
oai-ext-dn: oai-ext-dn:
privileged: true privileged: true
container_name: rfsim5g-oai-ext-dn container_name: rfsim5g-oai-ext-dn
image: oaisoftwarealliance/trf-gen-cn5g:focal image: oaisoftwarealliance/trf-gen-cn5g:latest
init: true init: true
entrypoint: /bin/bash -c \ entrypoint: /bin/bash -c \
"iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\ "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\

10
ci-scripts/yaml_files/5g_zmq_radio_2x2/docker-compose.yaml
View File

@@ -3,7 +3,7 @@
services: services:
mysql: mysql:
container_name: "rfsim5g-mysql" container_name: "rfsim5g-mysql"
image: mysql:8.0 image: mysql:9.6
init: true init: true
volumes: volumes:
- ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
@@ -26,7 +26,7 @@ services:
ipv4_address: 192.168.71.131 ipv4_address: 192.168.71.131
oai-amf: oai-amf:
container_name: "rfsim5g-oai-amf" container_name: "rfsim5g-oai-amf"
image: oaisoftwarealliance/oai-amf:v2.1.10 image: oaisoftwarealliance/oai-amf:v2.2.1
environment: environment:
- TZ=Europe/paris - TZ=Europe/paris
volumes: volumes:
@@ -38,7 +38,7 @@ services:
ipv4_address: 192.168.71.132 ipv4_address: 192.168.71.132
oai-smf: oai-smf:
container_name: "rfsim5g-oai-smf" container_name: "rfsim5g-oai-smf"
image: oaisoftwarealliance/oai-smf:v2.1.10 image: oaisoftwarealliance/oai-smf:v2.2.1
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
volumes: volumes:
@@ -50,7 +50,7 @@ services:
ipv4_address: 192.168.71.133 ipv4_address: 192.168.71.133
oai-upf: oai-upf:
container_name: "rfsim5g-oai-upf" container_name: "rfsim5g-oai-upf"
image: oaisoftwarealliance/oai-upf:v2.1.10 image: oaisoftwarealliance/oai-upf:v2.2.1
init: true init: true
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
@@ -74,7 +74,7 @@ services:
oai-ext-dn: oai-ext-dn:
privileged: true privileged: true
container_name: rfsim5g-oai-ext-dn container_name: rfsim5g-oai-ext-dn
image: oaisoftwarealliance/trf-gen-cn5g:focal image: oaisoftwarealliance/trf-gen-cn5g:latest
init: true init: true
entrypoint: /bin/bash -c \ entrypoint: /bin/bash -c \
"iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\ "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\

10
ci-scripts/yaml_files/5g_zmq_radio_2x2_ocudu/docker-compose.yaml
View File

@@ -3,7 +3,7 @@
services: services:
mysql: mysql:
container_name: "rfsim5g-mysql" container_name: "rfsim5g-mysql"
image: mysql:8.0 image: mysql:9.6
init: true init: true
volumes: volumes:
- ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
@@ -26,7 +26,7 @@ services:
ipv4_address: 192.168.71.131 ipv4_address: 192.168.71.131
oai-amf: oai-amf:
container_name: "rfsim5g-oai-amf" container_name: "rfsim5g-oai-amf"
image: oaisoftwarealliance/oai-amf:v2.1.10 image: oaisoftwarealliance/oai-amf:v2.2.1
environment: environment:
- TZ=Europe/paris - TZ=Europe/paris
volumes: volumes:
@@ -38,7 +38,7 @@ services:
ipv4_address: 192.168.71.132 ipv4_address: 192.168.71.132
oai-smf: oai-smf:
container_name: "rfsim5g-oai-smf" container_name: "rfsim5g-oai-smf"
image: oaisoftwarealliance/oai-smf:v2.1.10 image: oaisoftwarealliance/oai-smf:v2.2.1
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
volumes: volumes:
@@ -50,7 +50,7 @@ services:
ipv4_address: 192.168.71.133 ipv4_address: 192.168.71.133
oai-upf: oai-upf:
container_name: "rfsim5g-oai-upf" container_name: "rfsim5g-oai-upf"
image: oaisoftwarealliance/oai-upf:v2.1.10 image: oaisoftwarealliance/oai-upf:v2.2.1
init: true init: true
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
@@ -74,7 +74,7 @@ services:
oai-ext-dn: oai-ext-dn:
privileged: true privileged: true
container_name: rfsim5g-oai-ext-dn container_name: rfsim5g-oai-ext-dn
image: oaisoftwarealliance/trf-gen-cn5g:focal image: oaisoftwarealliance/trf-gen-cn5g:latest
init: true init: true
entrypoint: /bin/bash -c \ entrypoint: /bin/bash -c \
"iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\ "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\

18
doc/tutorial_resources/oai-cn5g/docker-compose-positioning.yaml
View File

@@ -36,7 +36,7 @@ services:
ipv4_address: 192.168.70.139 ipv4_address: 192.168.70.139
oai-udr: oai-udr:
container_name: "oai-udr" container_name: "oai-udr"
image: oaisoftwarealliance/oai-udr:develop image: oaisoftwarealliance/oai-udr:v2.2.1
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
@@ -52,7 +52,7 @@ services:
ipv4_address: 192.168.70.136 ipv4_address: 192.168.70.136
oai-udm: oai-udm:
container_name: "oai-udm" container_name: "oai-udm"
image: oaisoftwarealliance/oai-udm:develop image: oaisoftwarealliance/oai-udm:v2.2.1
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
@@ -67,7 +67,7 @@ services:
ipv4_address: 192.168.70.137 ipv4_address: 192.168.70.137
oai-ausf: oai-ausf:
container_name: "oai-ausf" container_name: "oai-ausf"
image: oaisoftwarealliance/oai-ausf:develop image: oaisoftwarealliance/oai-ausf:v2.2.1
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
@@ -82,7 +82,7 @@ services:
ipv4_address: 192.168.70.138 ipv4_address: 192.168.70.138
oai-nrf: oai-nrf:
container_name: "oai-nrf" container_name: "oai-nrf"
image: oaisoftwarealliance/oai-nrf:develop image: oaisoftwarealliance/oai-nrf:v2.2.1
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
@@ -95,7 +95,7 @@ services:
ipv4_address: 192.168.70.130 ipv4_address: 192.168.70.130
oai-amf: oai-amf:
container_name: "oai-amf" container_name: "oai-amf"
image: oaisoftwarealliance/oai-amf:develop image: oaisoftwarealliance/oai-amf:v2.2.1
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
@@ -113,8 +113,8 @@ services:
ipv4_address: 192.168.70.132 ipv4_address: 192.168.70.132
oai-lmf: oai-lmf:
container_name: "oai-lmf" container_name: "oai-lmf"
image: oaisoftwarealliance/oai-lmf:develop image: oaisoftwarealliance/oai-lmf:v2.2.1
#image: oai-lmf:psoElementwiseTdoAmeanVarTDoAfilter #image: oai-lmf:psoElementwiseTdoAmeanVarTDoAfilter
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
@@ -131,7 +131,7 @@ services:
ipv4_address: 192.168.70.141 ipv4_address: 192.168.70.141
oai-smf: oai-smf:
container_name: "oai-smf" container_name: "oai-smf"
image: oaisoftwarealliance/oai-smf:develop image: oaisoftwarealliance/oai-smf:v2.2.1
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
@@ -148,7 +148,7 @@ services:
ipv4_address: 192.168.70.133 ipv4_address: 192.168.70.133
oai-upf: oai-upf:
container_name: "oai-upf" container_name: "oai-upf"
image: oaisoftwarealliance/oai-upf:develop image: oaisoftwarealliance/oai-upf:v2.2.1
expose: expose:
- 2152/udp - 2152/udp
- 8805/udp - 8805/udp

14
doc/tutorial_resources/oai-cn5g/docker-compose.yaml
View File

@@ -36,7 +36,7 @@ services:
ipv4_address: 192.168.70.139 ipv4_address: 192.168.70.139
oai-udr: oai-udr:
container_name: "oai-udr" container_name: "oai-udr"
image: oaisoftwarealliance/oai-udr:develop image: oaisoftwarealliance/oai-udr:v2.2.1
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
@@ -52,7 +52,7 @@ services:
ipv4_address: 192.168.70.136 ipv4_address: 192.168.70.136
oai-udm: oai-udm:
container_name: "oai-udm" container_name: "oai-udm"
image: oaisoftwarealliance/oai-udm:develop image: oaisoftwarealliance/oai-udm:v2.2.1
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
@@ -67,7 +67,7 @@ services:
ipv4_address: 192.168.70.137 ipv4_address: 192.168.70.137
oai-ausf: oai-ausf:
container_name: "oai-ausf" container_name: "oai-ausf"
image: oaisoftwarealliance/oai-ausf:develop image: oaisoftwarealliance/oai-ausf:v2.2.1
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
@@ -82,7 +82,7 @@ services:
ipv4_address: 192.168.70.138 ipv4_address: 192.168.70.138
oai-nrf: oai-nrf:
container_name: "oai-nrf" container_name: "oai-nrf"
image: oaisoftwarealliance/oai-nrf:develop image: oaisoftwarealliance/oai-nrf:v2.2.1
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
@@ -95,7 +95,7 @@ services:
ipv4_address: 192.168.70.130 ipv4_address: 192.168.70.130
oai-amf: oai-amf:
container_name: "oai-amf" container_name: "oai-amf"
image: oaisoftwarealliance/oai-amf:develop image: oaisoftwarealliance/oai-amf:v2.2.1
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
@@ -113,7 +113,7 @@ services:
ipv4_address: 192.168.70.132 ipv4_address: 192.168.70.132
oai-smf: oai-smf:
container_name: "oai-smf" container_name: "oai-smf"
image: oaisoftwarealliance/oai-smf:develop image: oaisoftwarealliance/oai-smf:v2.2.1
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
@@ -130,7 +130,7 @@ services:
ipv4_address: 192.168.70.133 ipv4_address: 192.168.70.133
oai-upf: oai-upf:
container_name: "oai-upf" container_name: "oai-upf"
image: oaisoftwarealliance/oai-upf:develop image: oaisoftwarealliance/oai-upf:v2.2.1
expose: expose:
- 2152/udp - 2152/udp
- 8805/udp - 8805/udp

16
tests/nr-cu-nrppa/README.md
View File

@@ -43,14 +43,14 @@ To run this test, you need to set up the Core Network and build the tester.
Pull the required Docker images for the OAI 5G Core: Pull the required Docker images for the OAI 5G Core:
docker pull oaisoftwarealliance/ims:latest docker pull oaisoftwarealliance/ims:latest
docker pull oaisoftwarealliance/oai-amf:develop docker pull oaisoftwarealliance/oai-amf:v2.2.1
docker pull oaisoftwarealliance/oai-nrf:develop docker pull oaisoftwarealliance/oai-nrf:v2.2.1
docker pull oaisoftwarealliance/oai-smf:develop docker pull oaisoftwarealliance/oai-smf:v2.2.1
docker pull oaisoftwarealliance/oai-udr:develop docker pull oaisoftwarealliance/oai-udr:v2.2.1
docker pull oaisoftwarealliance/oai-upf:develop docker pull oaisoftwarealliance/oai-upf:v2.2.1
docker pull oaisoftwarealliance/oai-udm:develop docker pull oaisoftwarealliance/oai-udm:v2.2.1
docker pull oaisoftwarealliance/oai-ausf:develop docker pull oaisoftwarealliance/oai-ausf:v2.2.1
docker pull oaisoftwarealliance/oai-lmf:develop docker pull oaisoftwarealliance/oai-lmf:v2.2.1
Deploy the network using the positioning compose file: Deploy the network using the positioning compose file:

14
tests/nr-ue-nas-simulator/README.md
View File

@@ -50,13 +50,13 @@ To run this test, you need to set up the Core Network and build the tester.
Pull the required Docker images for the OAI 5G Core: Pull the required Docker images for the OAI 5G Core:
docker pull oaisoftwarealliance/ims:latest docker pull oaisoftwarealliance/ims:latest
docker pull oaisoftwarealliance/oai-amf:develop docker pull oaisoftwarealliance/oai-amf:v2.2.1
docker pull oaisoftwarealliance/oai-nrf:develop docker pull oaisoftwarealliance/oai-nrf:v2.2.1
docker pull oaisoftwarealliance/oai-smf:develop docker pull oaisoftwarealliance/oai-smf:v2.2.1
docker pull oaisoftwarealliance/oai-udr:develop docker pull oaisoftwarealliance/oai-udr:v2.2.1
docker pull oaisoftwarealliance/oai-upf:develop docker pull oaisoftwarealliance/oai-upf:v2.2.1
docker pull oaisoftwarealliance/oai-udm:develop docker pull oaisoftwarealliance/oai-udm:v2.2.1
docker pull oaisoftwarealliance/oai-ausf:develop docker pull oaisoftwarealliance/oai-ausf:v2.2.1
Deploy the network using the docker compose file: Deploy the network using the docker compose file: