diff --git a/ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml b/ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml index 7bc7a4d8cc..6813e13b10 100644 --- a/ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml +++ b/ci-scripts/yaml_files/4g_l2sim_fdd/docker-compose.yml @@ -166,7 +166,7 @@ services: retries: 5 trf_gen: - image: oaisoftwarealliance/trf-gen-cn5g:focal + image: oaisoftwarealliance/trf-gen-cn5g:latest privileged: true container_name: l2sim4g-trf-gen networks: diff --git a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml index a88f36fbc0..53793a924b 100644 --- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml +++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_05MHz/docker-compose.yml @@ -166,7 +166,7 @@ services: retries: 5 trf_gen: - image: oaisoftwarealliance/trf-gen-cn5g:focal + image: oaisoftwarealliance/trf-gen-cn5g:latest privileged: true container_name: rfsim4g-trf-gen networks: diff --git a/ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml index 2b19d5bbb7..f61c077b70 100644 --- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml +++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_10MHz/docker-compose.yml @@ -166,7 +166,7 @@ services: retries: 5 trf_gen: - image: oaisoftwarealliance/trf-gen-cn5g:focal + image: oaisoftwarealliance/trf-gen-cn5g:latest privileged: true container_name: rfsim4g-trf-gen networks: diff --git a/ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml index 0e6caffb13..81362b26d1 100644 --- a/ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml +++ b/ci-scripts/yaml_files/4g_rfsimulator_fdd_20MHz/docker-compose.yml @@ -166,7 +166,7 @@ services: retries: 5 trf_gen: - image: oaisoftwarealliance/trf-gen-cn5g:focal + image: oaisoftwarealliance/trf-gen-cn5g:latest privileged: true container_name: rfsim4g-trf-gen networks: diff --git a/ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml b/ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml index b795350642..35672381cc 100644 --- a/ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml +++ b/ci-scripts/yaml_files/4g_rfsimulator_tdd_05MHz/docker-compose.yml @@ -166,7 +166,7 @@ services: retries: 5 trf_gen: - image: oaisoftwarealliance/trf-gen-cn5g:focal + image: oaisoftwarealliance/trf-gen-cn5g:latest privileged: true container_name: rfsim4g-trf-gen networks: diff --git a/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml b/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml index 58b5748668..a606c50ccc 100644 --- a/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_f1_rfsimulator/docker-compose.yaml @@ -3,7 +3,7 @@ services: mysql: container_name: "rfsim5g-mysql" - image: mysql:8.0 + image: mysql:9.6 init: true volumes: - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql @@ -26,7 +26,7 @@ services: ipv4_address: 192.168.71.131 oai-amf: container_name: "rfsim5g-oai-amf" - image: oaisoftwarealliance/oai-amf:v2.1.10 + image: oaisoftwarealliance/oai-amf:v2.2.1 environment: - TZ=Europe/paris volumes: @@ -38,7 +38,7 @@ services: ipv4_address: 192.168.71.132 oai-smf: container_name: "rfsim5g-oai-smf" - image: oaisoftwarealliance/oai-smf:v2.1.10 + image: oaisoftwarealliance/oai-smf:v2.2.1 environment: - TZ=Europe/Paris volumes: @@ -50,7 +50,7 @@ services: ipv4_address: 192.168.71.133 oai-upf: container_name: "rfsim5g-oai-upf" - image: oaisoftwarealliance/oai-upf:v2.1.10 + image: oaisoftwarealliance/oai-upf:v2.2.1 init: true environment: - TZ=Europe/Paris @@ -75,7 +75,7 @@ services: oai-ext-dn: privileged: true container_name: rfsim5g-oai-ext-dn - image: oaisoftwarealliance/trf-gen-cn5g:focal + image: oaisoftwarealliance/trf-gen-cn5g:latest init: true entrypoint: /bin/bash -c \ "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\ diff --git a/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml b/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml index f43c8aaa03..9d1a35a249 100644 --- a/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml @@ -3,7 +3,7 @@ services: mysql: container_name: "rfsim5g-mysql" - image: mysql:8.0 + image: mysql:9.6 init: true volumes: - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql @@ -26,7 +26,7 @@ services: ipv4_address: 192.168.71.131 oai-amf: container_name: "rfsim5g-oai-amf" - image: oaisoftwarealliance/oai-amf:v2.1.10 + image: oaisoftwarealliance/oai-amf:v2.2.1 environment: - TZ=Europe/paris volumes: @@ -38,7 +38,7 @@ services: ipv4_address: 192.168.71.132 oai-smf: container_name: "rfsim5g-oai-smf" - image: oaisoftwarealliance/oai-smf:v2.1.10 + image: oaisoftwarealliance/oai-smf:v2.2.1 environment: - TZ=Europe/Paris volumes: @@ -50,7 +50,7 @@ services: ipv4_address: 192.168.71.133 oai-upf: container_name: "rfsim5g-oai-upf" - image: oaisoftwarealliance/oai-upf:v2.1.10 + image: oaisoftwarealliance/oai-upf:v2.2.1 init: true environment: - TZ=Europe/Paris @@ -74,7 +74,7 @@ services: oai-ext-dn: privileged: true container_name: rfsim5g-oai-ext-dn - image: oaisoftwarealliance/trf-gen-cn5g:focal + image: oaisoftwarealliance/trf-gen-cn5g:latest init: true entrypoint: /bin/bash -c \ "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\ diff --git a/ci-scripts/yaml_files/5g_rfsimulator/README.md b/ci-scripts/yaml_files/5g_rfsimulator/README.md index d2ef888771..6090b4b918 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator/README.md +++ b/ci-scripts/yaml_files/5g_rfsimulator/README.md @@ -38,11 +38,11 @@ Password: Now pull images. ```bash -$ docker pull mysql:8.0 -$ docker pull oaisoftwarealliance/oai-amf:v2.1.10 -$ docker pull oaisoftwarealliance/oai-smf:v2.1.10 -$ docker pull oaisoftwarealliance/oai-upf:v2.1.10 -$ docker pull oaisoftwarealliance/trf-gen-cn5g:focal +$ docker pull mysql:9.6 +$ docker pull oaisoftwarealliance/oai-amf:v2.2.1 +$ docker pull oaisoftwarealliance/oai-smf:v2.2.1 +$ docker pull oaisoftwarealliance/oai-upf:v2.2.1 +$ docker pull oaisoftwarealliance/trf-gen-cn5g:latest $ docker pull oaisoftwarealliance/oai-gnb:develop $ docker pull oaisoftwarealliance/oai-nr-ue:develop @@ -570,7 +570,7 @@ runs the gnb service with modified gNB executable. ```bash docker compose -f docker-compose.yaml -f local-override.yaml up -d oai-gnb ``` -This command rebuilds both the gNB & nrUE and runs the oai-nr-ue container with +This command rebuilds both the gNB & nrUE and runs the oai-nr-ue container with modified nrUE executable. ```bash docker compose -f docker-compose.yaml -f local-override.yaml up -d oai-nr-ue diff --git a/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml index cf7d5b5f85..a668adc840 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator/docker-compose.yaml @@ -3,7 +3,7 @@ services: mysql: container_name: "rfsim5g-mysql" - image: mysql:8.0 + image: mysql:9.6 init: true volumes: - ./oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql @@ -26,7 +26,7 @@ services: ipv4_address: 192.168.71.131 oai-amf: container_name: "rfsim5g-oai-amf" - image: oaisoftwarealliance/oai-amf:v2.1.10 + image: oaisoftwarealliance/oai-amf:v2.2.1 environment: - TZ=Europe/paris volumes: @@ -38,7 +38,7 @@ services: ipv4_address: 192.168.71.132 oai-smf: container_name: "rfsim5g-oai-smf" - image: oaisoftwarealliance/oai-smf:v2.1.10 + image: oaisoftwarealliance/oai-smf:v2.2.1 environment: - TZ=Europe/Paris volumes: @@ -50,7 +50,7 @@ services: ipv4_address: 192.168.71.133 oai-upf: container_name: "rfsim5g-oai-upf" - image: oaisoftwarealliance/oai-upf:v2.1.10 + image: oaisoftwarealliance/oai-upf:v2.2.1 init: true environment: - TZ=Europe/Paris @@ -74,7 +74,7 @@ services: oai-ext-dn: privileged: true container_name: rfsim5g-oai-ext-dn - image: oaisoftwarealliance/trf-gen-cn5g:focal + image: oaisoftwarealliance/trf-gen-cn5g:latest init: true entrypoint: /bin/bash -c \ "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\ diff --git a/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml index 299ebbc543..0ae419fb4c 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml @@ -3,7 +3,7 @@ services: mysql: container_name: "rfsim5g-mysql" - image: mysql:8.0 + image: mysql:9.6 init: true volumes: - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql @@ -26,7 +26,7 @@ services: ipv4_address: 192.168.71.131 oai-amf: container_name: "rfsim5g-oai-amf" - image: oaisoftwarealliance/oai-amf:v2.1.10 + image: oaisoftwarealliance/oai-amf:v2.2.1 environment: - TZ=Europe/paris volumes: @@ -38,7 +38,7 @@ services: ipv4_address: 192.168.71.132 oai-smf: container_name: "rfsim5g-oai-smf" - image: oaisoftwarealliance/oai-smf:v2.1.10 + image: oaisoftwarealliance/oai-smf:v2.2.1 environment: - TZ=Europe/Paris volumes: @@ -50,7 +50,7 @@ services: ipv4_address: 192.168.71.133 oai-upf: container_name: "rfsim5g-oai-upf" - image: oaisoftwarealliance/oai-upf:v2.1.10 + image: oaisoftwarealliance/oai-upf:v2.2.1 init: true environment: - TZ=Europe/Paris @@ -74,7 +74,7 @@ services: oai-ext-dn: privileged: true container_name: rfsim5g-oai-ext-dn - image: oaisoftwarealliance/trf-gen-cn5g:focal + image: oaisoftwarealliance/trf-gen-cn5g:latest init: true entrypoint: /bin/bash -c \ "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\ diff --git a/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml index 8b4c02da2e..d22850b214 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_2x2/docker-compose.yaml @@ -3,7 +3,7 @@ services: mysql: container_name: "rfsim5g-mysql" - image: mysql:8.0 + image: mysql:9.6 init: true volumes: - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql @@ -26,7 +26,7 @@ services: ipv4_address: 192.168.71.131 oai-amf: container_name: "rfsim5g-oai-amf" - image: oaisoftwarealliance/oai-amf:v2.1.10 + image: oaisoftwarealliance/oai-amf:v2.2.1 environment: - TZ=Europe/paris volumes: @@ -38,7 +38,7 @@ services: ipv4_address: 192.168.71.132 oai-smf: container_name: "rfsim5g-oai-smf" - image: oaisoftwarealliance/oai-smf:v2.1.10 + image: oaisoftwarealliance/oai-smf:v2.2.1 environment: - TZ=Europe/Paris volumes: @@ -50,7 +50,7 @@ services: ipv4_address: 192.168.71.133 oai-upf: container_name: "rfsim5g-oai-upf" - image: oaisoftwarealliance/oai-upf:v2.1.10 + image: oaisoftwarealliance/oai-upf:v2.2.1 init: true environment: - TZ=Europe/Paris @@ -74,7 +74,7 @@ services: oai-ext-dn: privileged: true container_name: rfsim5g-oai-ext-dn - image: oaisoftwarealliance/trf-gen-cn5g:focal + image: oaisoftwarealliance/trf-gen-cn5g:latest init: true entrypoint: /bin/bash -c \ "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\ diff --git a/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml index 0f03a33c82..a78f2ef897 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_e1/docker-compose.yaml @@ -3,7 +3,7 @@ services: mysql: container_name: "rfsim5g-mysql" - image: mysql:8.0 + image: mysql:9.6 init: true volumes: - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql @@ -26,7 +26,7 @@ services: ipv4_address: 192.168.71.131 oai-amf: container_name: "rfsim5g-oai-amf" - image: oaisoftwarealliance/oai-amf:v2.1.10 + image: oaisoftwarealliance/oai-amf:v2.2.1 environment: - TZ=Europe/paris volumes: @@ -38,7 +38,7 @@ services: ipv4_address: 192.168.71.132 oai-smf: container_name: "rfsim5g-oai-smf" - image: oaisoftwarealliance/oai-smf:v2.1.10 + image: oaisoftwarealliance/oai-smf:v2.2.1 environment: - TZ=Europe/Paris volumes: @@ -50,7 +50,7 @@ services: ipv4_address: 192.168.71.133 oai-upf: container_name: "rfsim5g-oai-upf" - image: oaisoftwarealliance/oai-upf:v2.1.10 + image: oaisoftwarealliance/oai-upf:v2.2.1 init: true environment: - TZ=Europe/Paris diff --git a/ci-scripts/yaml_files/5g_rfsimulator_fr2_66prb/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_fr2_66prb/docker-compose.yaml index 9ed90c8b2d..b27cd57a06 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_fr2_66prb/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_fr2_66prb/docker-compose.yaml @@ -3,7 +3,7 @@ services: mysql: container_name: "rfsim5g-mysql" - image: mysql:8.0 + image: mysql:9.6 init: true volumes: - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql @@ -26,7 +26,7 @@ services: ipv4_address: 192.168.71.131 oai-amf: container_name: "rfsim5g-oai-amf" - image: oaisoftwarealliance/oai-amf:v2.1.10 + image: oaisoftwarealliance/oai-amf:v2.2.1 environment: - TZ=Europe/paris volumes: @@ -38,7 +38,7 @@ services: ipv4_address: 192.168.71.132 oai-smf: container_name: "rfsim5g-oai-smf" - image: oaisoftwarealliance/oai-smf:v2.1.10 + image: oaisoftwarealliance/oai-smf:v2.2.1 environment: - TZ=Europe/Paris volumes: @@ -50,7 +50,7 @@ services: ipv4_address: 192.168.71.133 oai-upf: container_name: "rfsim5g-oai-upf" - image: oaisoftwarealliance/oai-upf:v2.1.10 + image: oaisoftwarealliance/oai-upf:v2.2.1 init: true environment: - TZ=Europe/Paris @@ -74,7 +74,7 @@ services: oai-ext-dn: privileged: true container_name: rfsim5g-oai-ext-dn - image: oaisoftwarealliance/trf-gen-cn5g:focal + image: oaisoftwarealliance/trf-gen-cn5g:latest init: true entrypoint: /bin/bash -c \ "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\ diff --git a/ci-scripts/yaml_files/5g_rfsimulator_multiue/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_multiue/docker-compose.yaml index 5e376f650e..313d36bbfb 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_multiue/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_multiue/docker-compose.yaml @@ -3,7 +3,7 @@ services: mysql: container_name: "rfsim5g-mysql" - image: mysql:8.0 + image: mysql:9.6 volumes: - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql - ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh @@ -23,7 +23,7 @@ services: ipv4_address: 192.168.71.131 oai-amf: container_name: "rfsim5g-oai-amf" - image: oaisoftwarealliance/oai-amf:v2.1.10 + image: oaisoftwarealliance/oai-amf:v2.2.1 environment: - TZ=Europe/paris volumes: @@ -35,7 +35,7 @@ services: ipv4_address: 192.168.71.132 oai-smf: container_name: "rfsim5g-oai-smf" - image: oaisoftwarealliance/oai-smf:v2.1.10 + image: oaisoftwarealliance/oai-smf:v2.2.1 environment: - TZ=Europe/Paris volumes: @@ -47,7 +47,7 @@ services: ipv4_address: 192.168.71.133 oai-upf: container_name: "rfsim5g-oai-upf" - image: oaisoftwarealliance/oai-upf:v2.1.10 + image: oaisoftwarealliance/oai-upf:v2.2.1 environment: - TZ=Europe/Paris volumes: @@ -70,7 +70,7 @@ services: oai-ext-dn: privileged: true container_name: rfsim5g-oai-ext-dn - image: oaisoftwarealliance/trf-gen-cn5g:focal + image: oaisoftwarealliance/trf-gen-cn5g:latest 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" diff --git a/ci-scripts/yaml_files/5g_rfsimulator_n2_ho/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_n2_ho/docker-compose.yaml index 9fe4bdc25f..5e11c8cb3c 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_n2_ho/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_n2_ho/docker-compose.yaml @@ -3,7 +3,7 @@ services: mysql: container_name: "rfsim5g-mysql" - image: mysql:8.0 + image: mysql:9.6 volumes: - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql - ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh @@ -23,7 +23,7 @@ services: ipv4_address: 192.168.71.131 oai-amf: container_name: "rfsim5g-oai-amf" - image: oaisoftwarealliance/oai-amf:ci-tmp-pr-372-26c14bcd + image: oaisoftwarealliance/oai-amf:v2.2.1 environment: - TZ=Europe/paris volumes: @@ -35,7 +35,7 @@ services: ipv4_address: 192.168.71.132 oai-smf: container_name: "rfsim5g-oai-smf" - image: oaisoftwarealliance/oai-smf:v2.1.9 + image: oaisoftwarealliance/oai-smf:v2.2.1 environment: - TZ=Europe/Paris volumes: @@ -47,7 +47,7 @@ services: ipv4_address: 192.168.71.133 oai-upf: container_name: "rfsim5g-oai-upf" - image: oaisoftwarealliance/oai-upf:v2.1.9 + image: oaisoftwarealliance/oai-upf:v2.2.1 environment: - TZ=Europe/Paris volumes: @@ -70,7 +70,7 @@ services: oai-ext-dn: privileged: true container_name: rfsim5g-oai-ext-dn - image: oaisoftwarealliance/trf-gen-cn5g:focal + image: oaisoftwarealliance/trf-gen-cn5g:latest 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" diff --git a/ci-scripts/yaml_files/5g_rfsimulator_ntn_geo/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_ntn_geo/docker-compose.yaml index 785402c3f7..42899ae248 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_ntn_geo/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_ntn_geo/docker-compose.yaml @@ -3,7 +3,7 @@ services: mysql: container_name: "rfsim5g-mysql" - image: mysql:8.0 + image: mysql:9.6 init: true volumes: - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql @@ -26,7 +26,7 @@ services: ipv4_address: 192.168.71.131 oai-amf: container_name: "rfsim5g-oai-amf" - image: oaisoftwarealliance/oai-amf:v2.1.10 + image: oaisoftwarealliance/oai-amf:v2.2.1 environment: - TZ=Europe/paris volumes: @@ -38,7 +38,7 @@ services: ipv4_address: 192.168.71.132 oai-smf: container_name: "rfsim5g-oai-smf" - image: oaisoftwarealliance/oai-smf:v2.1.10 + image: oaisoftwarealliance/oai-smf:v2.2.1 environment: - TZ=Europe/Paris volumes: @@ -50,7 +50,7 @@ services: ipv4_address: 192.168.71.133 oai-upf: container_name: "rfsim5g-oai-upf" - image: oaisoftwarealliance/oai-upf:v2.1.10 + image: oaisoftwarealliance/oai-upf:v2.2.1 init: true environment: - TZ=Europe/Paris @@ -74,7 +74,7 @@ services: oai-ext-dn: privileged: true container_name: rfsim5g-oai-ext-dn - image: oaisoftwarealliance/trf-gen-cn5g:focal + image: oaisoftwarealliance/trf-gen-cn5g:latest init: true entrypoint: /bin/bash -c \ "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\ diff --git a/ci-scripts/yaml_files/5g_rfsimulator_ntn_leo/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_ntn_leo/docker-compose.yaml index fd57881969..c7343e9a25 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_ntn_leo/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_ntn_leo/docker-compose.yaml @@ -3,7 +3,7 @@ services: mysql: container_name: "rfsim5g-mysql" - image: mysql:8.0 + image: mysql:9.6 volumes: - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql - ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh @@ -25,7 +25,7 @@ services: ipv4_address: 192.168.71.131 oai-amf: container_name: "rfsim5g-oai-amf" - image: oaisoftwarealliance/oai-amf:v2.1.10 + image: oaisoftwarealliance/oai-amf:v2.2.1 environment: - TZ=Europe/paris volumes: @@ -37,7 +37,7 @@ services: ipv4_address: 192.168.71.132 oai-smf: container_name: "rfsim5g-oai-smf" - image: oaisoftwarealliance/oai-smf:v2.1.10 + image: oaisoftwarealliance/oai-smf:v2.2.1 environment: - TZ=Europe/Paris volumes: @@ -49,7 +49,7 @@ services: ipv4_address: 192.168.71.133 oai-upf: container_name: "rfsim5g-oai-upf" - image: oaisoftwarealliance/oai-upf:v2.1.10 + image: oaisoftwarealliance/oai-upf:v2.2.1 environment: - TZ=Europe/Paris volumes: @@ -72,7 +72,7 @@ services: oai-ext-dn: privileged: true container_name: rfsim5g-oai-ext-dn - image: oaisoftwarealliance/trf-gen-cn5g:focal + image: oaisoftwarealliance/trf-gen-cn5g:latest 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" diff --git a/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml b/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml index 581c2362fe..60ca044f94 100644 --- a/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml @@ -3,7 +3,7 @@ services: mysql: container_name: "rfsim5g-mysql" - image: mysql:8.0 + image: mysql:9.6 init: true volumes: - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql @@ -26,7 +26,7 @@ services: ipv4_address: 192.168.71.131 oai-amf: container_name: "rfsim5g-oai-amf" - image: oaisoftwarealliance/oai-amf:v2.1.10 + image: oaisoftwarealliance/oai-amf:v2.2.1 environment: - TZ=Europe/paris volumes: @@ -38,7 +38,7 @@ services: ipv4_address: 192.168.71.132 oai-smf: container_name: "rfsim5g-oai-smf" - image: oaisoftwarealliance/oai-smf:v2.1.10 + image: oaisoftwarealliance/oai-smf:v2.2.1 environment: - TZ=Europe/Paris volumes: @@ -50,7 +50,7 @@ services: ipv4_address: 192.168.71.133 oai-upf: container_name: "rfsim5g-oai-upf" - image: oaisoftwarealliance/oai-upf:v2.1.10 + image: oaisoftwarealliance/oai-upf:v2.2.1 init: true environment: - TZ=Europe/Paris @@ -74,7 +74,7 @@ services: oai-ext-dn: privileged: true container_name: rfsim5g-oai-ext-dn - image: oaisoftwarealliance/trf-gen-cn5g:focal + image: oaisoftwarealliance/trf-gen-cn5g:latest init: true entrypoint: /bin/bash -c \ "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\ diff --git a/ci-scripts/yaml_files/5g_vrtsim_chanmod/docker-compose.yaml b/ci-scripts/yaml_files/5g_vrtsim_chanmod/docker-compose.yaml index 357444be73..85303fe749 100644 --- a/ci-scripts/yaml_files/5g_vrtsim_chanmod/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_vrtsim_chanmod/docker-compose.yaml @@ -3,7 +3,7 @@ services: mysql: container_name: "rfsim5g-mysql" - image: mysql:8.0 + image: mysql:9.6 init: true volumes: - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql @@ -26,7 +26,7 @@ services: ipv4_address: 192.168.71.131 oai-amf: container_name: "rfsim5g-oai-amf" - image: oaisoftwarealliance/oai-amf:v2.1.10 + image: oaisoftwarealliance/oai-amf:v2.2.1 environment: - TZ=Europe/paris volumes: @@ -38,7 +38,7 @@ services: ipv4_address: 192.168.71.132 oai-smf: container_name: "rfsim5g-oai-smf" - image: oaisoftwarealliance/oai-smf:v2.1.10 + image: oaisoftwarealliance/oai-smf:v2.2.1 environment: - TZ=Europe/Paris volumes: @@ -50,7 +50,7 @@ services: ipv4_address: 192.168.71.133 oai-upf: container_name: "rfsim5g-oai-upf" - image: oaisoftwarealliance/oai-upf:v2.1.10 + image: oaisoftwarealliance/oai-upf:v2.2.1 init: true environment: - TZ=Europe/Paris diff --git a/ci-scripts/yaml_files/5g_vrtsim_cirdb/docker-compose.yaml b/ci-scripts/yaml_files/5g_vrtsim_cirdb/docker-compose.yaml index 183c244018..7ab1020d01 100644 --- a/ci-scripts/yaml_files/5g_vrtsim_cirdb/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_vrtsim_cirdb/docker-compose.yaml @@ -12,7 +12,7 @@ services: mysql: container_name: "rfsim5g-mysql" - image: mysql:8.0 + image: mysql:9.6 init: true volumes: - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql @@ -36,7 +36,7 @@ services: oai-amf: container_name: "rfsim5g-oai-amf" - image: oaisoftwarealliance/oai-amf:v2.1.10 + image: oaisoftwarealliance/oai-amf:v2.2.1 environment: - TZ=Europe/paris volumes: @@ -49,7 +49,7 @@ services: oai-smf: container_name: "rfsim5g-oai-smf" - image: oaisoftwarealliance/oai-smf:v2.1.10 + image: oaisoftwarealliance/oai-smf:v2.2.1 environment: - TZ=Europe/Paris volumes: @@ -62,7 +62,7 @@ services: oai-upf: container_name: "rfsim5g-oai-upf" - image: oaisoftwarealliance/oai-upf:v2.1.10 + image: oaisoftwarealliance/oai-upf:v2.2.1 init: true environment: - TZ=Europe/Paris diff --git a/ci-scripts/yaml_files/5g_vrtsim_multiue/docker-compose.yaml b/ci-scripts/yaml_files/5g_vrtsim_multiue/docker-compose.yaml index 49f2e9a4cc..349c61ff24 100644 --- a/ci-scripts/yaml_files/5g_vrtsim_multiue/docker-compose.yaml +++ b/ci-scripts/yaml_files/5g_vrtsim_multiue/docker-compose.yaml @@ -12,7 +12,7 @@ services: mysql: container_name: "rfsim5g-mysql" - image: mysql:8.0 + image: mysql:9.6 init: true volumes: - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql @@ -36,7 +36,7 @@ services: oai-amf: container_name: "rfsim5g-oai-amf" - image: oaisoftwarealliance/oai-amf:v2.1.10 + image: oaisoftwarealliance/oai-amf:v2.2.1 environment: - TZ=Europe/paris volumes: @@ -49,7 +49,7 @@ services: oai-smf: container_name: "rfsim5g-oai-smf" - image: oaisoftwarealliance/oai-smf:v2.1.10 + image: oaisoftwarealliance/oai-smf:v2.2.1 environment: - TZ=Europe/Paris volumes: @@ -62,7 +62,7 @@ services: oai-upf: container_name: "rfsim5g-oai-upf" - image: oaisoftwarealliance/oai-upf:v2.1.10 + image: oaisoftwarealliance/oai-upf:v2.2.1 init: true environment: - TZ=Europe/Paris diff --git a/ci-scripts/yaml_files/fr1_epc_20897/docker-compose.yml b/ci-scripts/yaml_files/fr1_epc_20897/docker-compose.yml index ee1f5c2110..3ab53378d9 100644 --- a/ci-scripts/yaml_files/fr1_epc_20897/docker-compose.yml +++ b/ci-scripts/yaml_files/fr1_epc_20897/docker-compose.yml @@ -184,7 +184,7 @@ services: retries: 5 trf_gen: - image: oaisoftwarealliance/trf-gen-cn5g:focal + image: oaisoftwarealliance/trf-gen-cn5g:latest privileged: true container_name: prod-trf-gen networks: diff --git a/ci-scripts/yaml_files/magma_lte_20892/docker-compose.yml b/ci-scripts/yaml_files/magma_lte_20892/docker-compose.yml index d025588de7..535561be8c 100644 --- a/ci-scripts/yaml_files/magma_lte_20892/docker-compose.yml +++ b/ci-scripts/yaml_files/magma_lte_20892/docker-compose.yml @@ -168,7 +168,7 @@ services: retries: 5 trf_gen: - image: oaisoftwarealliance/trf-gen-cn5g:focal + image: oaisoftwarealliance/trf-gen-cn5g:latest privileged: true container_name: prod-trf-gen networks: diff --git a/ci-scripts/yaml_files/magma_nsa_20897/docker-compose.yml b/ci-scripts/yaml_files/magma_nsa_20897/docker-compose.yml index 636f416bfb..5005a53de3 100644 --- a/ci-scripts/yaml_files/magma_nsa_20897/docker-compose.yml +++ b/ci-scripts/yaml_files/magma_nsa_20897/docker-compose.yml @@ -168,7 +168,7 @@ services: retries: 5 trf_gen: - image: oaisoftwarealliance/trf-gen-cn5g:focal + image: oaisoftwarealliance/trf-gen-cn5g:latest privileged: true container_name: prod-trf-gen networks: diff --git a/doc/tutorial_resources/oai-cn5g/docker-compose-positioning.yaml b/doc/tutorial_resources/oai-cn5g/docker-compose-positioning.yaml index 6b75c22b6b..c3b9d937c1 100644 --- a/doc/tutorial_resources/oai-cn5g/docker-compose-positioning.yaml +++ b/doc/tutorial_resources/oai-cn5g/docker-compose-positioning.yaml @@ -1,7 +1,7 @@ services: mysql: container_name: "mysql" - image: mysql:8.0 + image: mysql:9.6 volumes: - ./database/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql - ./healthscripts/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh @@ -172,7 +172,7 @@ services: privileged: true init: true container_name: oai-ext-dn - image: oaisoftwarealliance/trf-gen-cn5g:jammy + image: oaisoftwarealliance/trf-gen-cn5g:latest entrypoint: /bin/bash -c \ "ip route add 10.0.0.0/16 via 192.168.70.134 dev eth0; ip route; sleep infinity" command: ["/bin/bash", "-c", "trap : SIGTERM SIGINT; sleep infinity & wait"] diff --git a/doc/tutorial_resources/oai-cn5g/docker-compose.yaml b/doc/tutorial_resources/oai-cn5g/docker-compose.yaml index 0baf032fbb..d99eadb844 100644 --- a/doc/tutorial_resources/oai-cn5g/docker-compose.yaml +++ b/doc/tutorial_resources/oai-cn5g/docker-compose.yaml @@ -1,7 +1,7 @@ services: mysql: container_name: "mysql" - image: mysql:8.0 + image: mysql:9.6 volumes: - ./database/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql - ./healthscripts/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh @@ -154,9 +154,9 @@ services: privileged: true init: true container_name: oai-ext-dn - image: oaisoftwarealliance/trf-gen-cn5g:jammy + image: oaisoftwarealliance/trf-gen-cn5g:latest entrypoint: /bin/bash -c \ - "ip route add 10.0.0.0/16 via 192.168.70.134 dev eth0; ip route; sleep infinity" + "ip route add 10.0.0.0/16 via 192.168.70.134 dev eth0; ip route; iperf3 -s -D; sleep infinity" command: ["/bin/bash", "-c", "trap : SIGTERM SIGINT; sleep infinity & wait"] healthcheck: test: /bin/bash -c "ip r | grep 10.0.0"