diff --git a/ci-scripts/Jenkinsfile-GitLab-Load-Check b/ci-scripts/Jenkinsfile-GitLab-Load-Check index df42afdee21dc858711c91e744c68560f61c8e76..7b0e311fa00898a7c57623db77682702f4bd75f8 100644 --- a/ci-scripts/Jenkinsfile-GitLab-Load-Check +++ b/ci-scripts/Jenkinsfile-GitLab-Load-Check @@ -544,7 +544,7 @@ def checkImageInfo(imageName, origTag) { def updateDockerCompose(filename, lRanTag) { for (ii = 0; ii < imageNames.size(); ii++) { - sh 'sed -i -e "s@oaisoftwarealliance/' + imageNames[ii] + ':v1.5.0@' + imageNames[ii] + ':' + imageTags[ii] + '@" ' + filename + sh 'sed -i -e "s@oaisoftwarealliance/' + imageNames[ii] + ':develop@' + imageNames[ii] + ':' + imageTags[ii] + '@" ' + filename } // Mandatory for omec-gnbsim registration sh 'sed -i -e "s@EXTERNAL_UDM=no@EXTERNAL_UDM=yes@" ' + filename diff --git a/ci-scripts/Jenkinsfile-GitLab-Tutorial-Check b/ci-scripts/Jenkinsfile-GitLab-Tutorial-Check index e58ef30f9786f378736bc6a02aa4b8e3e0c40850..8a5e86cb21473c3f35c2f7563e03e1fa50ac1b9a 100644 --- a/ci-scripts/Jenkinsfile-GitLab-Tutorial-Check +++ b/ci-scripts/Jenkinsfile-GitLab-Tutorial-Check @@ -470,7 +470,7 @@ def checkImageInfo(imageName, origTag) { def updateDockerCompose(filename, lRanTag) { for (ii = 0; ii < imageNames.size(); ii++) { - sh 'sed -i -e "s@oaisoftwarealliance/' + imageNames[ii] + ':v1.5.0@' + imageNames[ii] + ':' + imageTags[ii] + '@" ' + filename + sh 'sed -i -e "s@oaisoftwarealliance/' + imageNames[ii] + ':develop@' + imageNames[ii] + ':' + imageTags[ii] + '@" ' + filename } sh 'sed -i -e "s@oaisoftwarealliance/trf-gen-cn5g:latest@trf-gen-cn5g:latest@" ' + filename // Using the develop variant of gnbsim diff --git a/docker-compose/docker-compose-basic-nonrf.yaml b/docker-compose/docker-compose-basic-nonrf.yaml index ff64fb203aa0212eb37eabef094c5e8d76bf84fa..c17cad2cecf116bae876069eeaea4b49cd81e7f1 100644 --- a/docker-compose/docker-compose-basic-nonrf.yaml +++ b/docker-compose/docker-compose-basic-nonrf.yaml @@ -22,7 +22,7 @@ services: ipv4_address: 192.168.70.131 oai-udr: container_name: "oai-udr" - image: oaisoftwarealliance/oai-udr:v1.5.0 + image: oaisoftwarealliance/oai-udr:develop environment: - TZ=Europe/Paris - UDR_NAME=OAI_UDR @@ -41,7 +41,7 @@ services: ipv4_address: 192.168.70.136 oai-udm: container_name: "oai-udm" - image: oaisoftwarealliance/oai-udm:v1.5.0 + image: oaisoftwarealliance/oai-udm:develop environment: - TZ=Europe/Paris - UDM_NAME=OAI_UDM @@ -57,7 +57,7 @@ services: ipv4_address: 192.168.70.137 oai-ausf: container_name: "oai-ausf" - image: oaisoftwarealliance/oai-ausf:v1.5.0 + image: oaisoftwarealliance/oai-ausf:develop environment: - TZ=Europe/Paris - AUSF_NAME=OAI_AUSF @@ -73,7 +73,7 @@ services: ipv4_address: 192.168.70.138 oai-amf: container_name: "oai-amf" - image: oaisoftwarealliance/oai-amf:v1.5.0 + image: oaisoftwarealliance/oai-amf:develop environment: - TZ=Europe/paris - MCC=208 @@ -121,7 +121,7 @@ services: ipv4_address: 192.168.70.132 oai-smf: container_name: "oai-smf" - image: oaisoftwarealliance/oai-smf:v1.5.0 + image: oaisoftwarealliance/oai-smf:develop environment: - TZ=Europe/Paris - SMF_INTERFACE_NAME_FOR_N4=eth0 @@ -177,7 +177,7 @@ services: ipv4_address: 192.168.70.133 oai-spgwu: container_name: "oai-spgwu" - image: oaisoftwarealliance/oai-spgwu-tiny:v1.5.0 + image: oaisoftwarealliance/oai-spgwu-tiny:develop environment: - TZ=Europe/Paris - SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP=eth0 diff --git a/docker-compose/docker-compose-basic-nrf-http2.yaml b/docker-compose/docker-compose-basic-nrf-http2.yaml index 09fe15ee0a3bc5e5dca7eec452b215eaa624c32d..3f4a3a97348398006be49f43aa8750d58a046d42 100644 --- a/docker-compose/docker-compose-basic-nrf-http2.yaml +++ b/docker-compose/docker-compose-basic-nrf-http2.yaml @@ -22,7 +22,7 @@ services: ipv4_address: 192.168.70.131 oai-udr: container_name: "oai-udr" - image: oaisoftwarealliance/oai-udr:v1.5.0 + image: oaisoftwarealliance/oai-udr:develop expose: - 80/tcp - 8080/tcp @@ -50,7 +50,7 @@ services: ipv4_address: 192.168.70.136 oai-udm: container_name: "oai-udm" - image: oaisoftwarealliance/oai-udm:v1.5.0 + image: oaisoftwarealliance/oai-udm:develop expose: - 80/tcp - 8080/tcp @@ -75,7 +75,7 @@ services: ipv4_address: 192.168.70.137 oai-ausf: container_name: "oai-ausf" - image: oaisoftwarealliance/oai-ausf:v1.5.0 + image: oaisoftwarealliance/oai-ausf:develop expose: - 80/tcp - 8080/tcp @@ -100,7 +100,7 @@ services: ipv4_address: 192.168.70.138 oai-nrf: container_name: "oai-nrf" - image: oaisoftwarealliance/oai-nrf:v1.5.0 + image: oaisoftwarealliance/oai-nrf:develop expose: - 80/tcp - 8080/tcp @@ -115,7 +115,7 @@ services: ipv4_address: 192.168.70.130 oai-amf: container_name: "oai-amf" - image: oaisoftwarealliance/oai-amf:v1.5.0 + image: oaisoftwarealliance/oai-amf:develop expose: - 80/tcp - 8080/tcp @@ -178,7 +178,7 @@ services: ipv4_address: 192.168.70.132 oai-smf: container_name: "oai-smf" - image: oaisoftwarealliance/oai-smf:v1.5.0 + image: oaisoftwarealliance/oai-smf:develop expose: - 80/tcp - 8080/tcp @@ -244,7 +244,7 @@ services: ipv4_address: 192.168.70.133 oai-spgwu: container_name: "oai-spgwu" - image: oaisoftwarealliance/oai-spgwu-tiny:v1.5.0 + image: oaisoftwarealliance/oai-spgwu-tiny:develop expose: - 2152/udp - 8805/udp diff --git a/docker-compose/docker-compose-basic-nrf.yaml b/docker-compose/docker-compose-basic-nrf.yaml index a72e476eba7d44b6104b2ef8d56f9cdb4c086bf6..6f16ef24059f3435d07411799e6a802f3e0e3a18 100644 --- a/docker-compose/docker-compose-basic-nrf.yaml +++ b/docker-compose/docker-compose-basic-nrf.yaml @@ -22,7 +22,7 @@ services: ipv4_address: 192.168.70.131 oai-udr: container_name: "oai-udr" - image: oaisoftwarealliance/oai-udr:v1.5.0 + image: oaisoftwarealliance/oai-udr:develop environment: - TZ=Europe/Paris - UDR_NAME=OAI_UDR @@ -44,7 +44,7 @@ services: ipv4_address: 192.168.70.136 oai-udm: container_name: "oai-udm" - image: oaisoftwarealliance/oai-udm:v1.5.0 + image: oaisoftwarealliance/oai-udm:develop environment: - TZ=Europe/Paris - UDM_NAME=OAI_UDM @@ -62,7 +62,7 @@ services: ipv4_address: 192.168.70.137 oai-ausf: container_name: "oai-ausf" - image: oaisoftwarealliance/oai-ausf:v1.5.0 + image: oaisoftwarealliance/oai-ausf:develop environment: - TZ=Europe/Paris - AUSF_NAME=OAI_AUSF @@ -80,7 +80,7 @@ services: ipv4_address: 192.168.70.138 oai-nrf: container_name: "oai-nrf" - image: oaisoftwarealliance/oai-nrf:v1.5.0 + image: oaisoftwarealliance/oai-nrf:develop environment: - TZ=Europe/Paris - NRF_INTERFACE_NAME_FOR_SBI=eth0 @@ -89,7 +89,7 @@ services: ipv4_address: 192.168.70.130 oai-amf: container_name: "oai-amf" - image: oaisoftwarealliance/oai-amf:v1.5.0 + image: oaisoftwarealliance/oai-amf:develop environment: - TZ=Europe/paris - MCC=208 @@ -145,7 +145,7 @@ services: ipv4_address: 192.168.70.132 oai-smf: container_name: "oai-smf" - image: oaisoftwarealliance/oai-smf:v1.5.0 + image: oaisoftwarealliance/oai-smf:develop environment: - TZ=Europe/Paris - SMF_INTERFACE_NAME_FOR_N4=eth0 @@ -203,7 +203,7 @@ services: ipv4_address: 192.168.70.133 oai-spgwu: container_name: "oai-spgwu" - image: oaisoftwarealliance/oai-spgwu-tiny:v1.5.0 + image: oaisoftwarealliance/oai-spgwu-tiny:develop environment: - TZ=Europe/Paris - SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP=eth0 diff --git a/docker-compose/docker-compose-basic-vpp-nonrf.yaml b/docker-compose/docker-compose-basic-vpp-nonrf.yaml index fed99d00ffc633802f4dfaf45074b9a607e2895c..7073b6ad452e5288cfbd7e4b6c37af4b4b661a70 100644 --- a/docker-compose/docker-compose-basic-vpp-nonrf.yaml +++ b/docker-compose/docker-compose-basic-vpp-nonrf.yaml @@ -22,7 +22,7 @@ services: ipv4_address: 192.168.70.131 oai-udr: container_name: "oai-udr" - image: oaisoftwarealliance/oai-udr:v1.5.0 + image: oaisoftwarealliance/oai-udr:develop environment: - TZ=Europe/Paris - UDR_NAME=OAI_UDR @@ -41,7 +41,7 @@ services: ipv4_address: 192.168.70.136 oai-udm: container_name: "oai-udm" - image: oaisoftwarealliance/oai-udm:v1.5.0 + image: oaisoftwarealliance/oai-udm:develop environment: - TZ=Europe/Paris - UDM_NAME=OAI_UDM @@ -57,7 +57,7 @@ services: ipv4_address: 192.168.70.137 oai-ausf: container_name: "oai-ausf" - image: oaisoftwarealliance/oai-ausf:v1.5.0 + image: oaisoftwarealliance/oai-ausf:develop environment: - TZ=Europe/Paris - AUSF_NAME=OAI_AUSF @@ -73,7 +73,7 @@ services: ipv4_address: 192.168.70.138 oai-amf: container_name: "oai-amf" - image: oaisoftwarealliance/oai-amf:v1.5.0 + image: oaisoftwarealliance/oai-amf:develop environment: - TZ=Europe/paris - MCC=208 @@ -124,7 +124,7 @@ services: ipv4_address: 192.168.70.132 oai-smf: container_name: "oai-smf" - image: oaisoftwarealliance/oai-smf:v1.5.0 + image: oaisoftwarealliance/oai-smf:develop environment: - TZ=Europe/Paris - SMF_INTERFACE_NAME_FOR_N4=eth0 @@ -181,7 +181,7 @@ services: vpp-upf: privileged: true container_name: "vpp-upf" - image: oaisoftwarealliance/oai-upf-vpp:v1.5.0 + image: oaisoftwarealliance/oai-upf-vpp:develop environment: - IF_1_IP=192.168.70.201 - IF_1_TYPE=N4 diff --git a/docker-compose/docker-compose-basic-vpp-nrf-http2.yaml b/docker-compose/docker-compose-basic-vpp-nrf-http2.yaml index 42bb7a7d2cc055c9611276f57eb8e7af27f57217..d273abf32e9abd7dabf4b42749099163ac45bcda 100644 --- a/docker-compose/docker-compose-basic-vpp-nrf-http2.yaml +++ b/docker-compose/docker-compose-basic-vpp-nrf-http2.yaml @@ -22,7 +22,7 @@ services: ipv4_address: 192.168.70.131 oai-udr: container_name: "oai-udr" - image: oaisoftwarealliance/oai-udr:v1.5.0 + image: oaisoftwarealliance/oai-udr:develop expose: - 80/tcp - 8080/tcp @@ -49,7 +49,7 @@ services: ipv4_address: 192.168.70.136 oai-udm: container_name: "oai-udm" - image: oaisoftwarealliance/oai-udm:v1.5.0 + image: oaisoftwarealliance/oai-udm:develop expose: - 80/tcp - 8080/tcp @@ -74,7 +74,7 @@ services: ipv4_address: 192.168.70.137 oai-ausf: container_name: "oai-ausf" - image: oaisoftwarealliance/oai-ausf:v1.5.0 + image: oaisoftwarealliance/oai-ausf:develop expose: - 80/tcp - 8080/tcp @@ -99,7 +99,7 @@ services: ipv4_address: 192.168.70.138 oai-nrf: container_name: "oai-nrf" - image: oaisoftwarealliance/oai-nrf:v1.5.0 + image: oaisoftwarealliance/oai-nrf:develop expose: - 80/tcp - 8080/tcp @@ -111,7 +111,7 @@ services: ipv4_address: 192.168.70.130 oai-amf: container_name: "oai-amf" - image: oaisoftwarealliance/oai-amf:v1.5.0 + image: oaisoftwarealliance/oai-amf:develop expose: - 80/tcp - 8080/tcp @@ -174,7 +174,7 @@ services: ipv4_address: 192.168.70.132 oai-smf: container_name: "oai-smf" - image: oaisoftwarealliance/oai-smf:v1.5.0 + image: oaisoftwarealliance/oai-smf:develop expose: - 80/tcp - 8080/tcp @@ -240,7 +240,7 @@ services: vpp-upf: privileged: true container_name: "vpp-upf" - image: oaisoftwarealliance/oai-upf-vpp:v1.5.0 + image: oaisoftwarealliance/oai-upf-vpp:develop environment: - IF_1_IP=192.168.70.201 - IF_1_TYPE=N4 diff --git a/docker-compose/docker-compose-basic-vpp-nrf.yaml b/docker-compose/docker-compose-basic-vpp-nrf.yaml index 2c960aae572382293a08a2441c46868b8e49c1b8..77c3d71e375f8d3ff422fe24e359f6fb95525ae4 100644 --- a/docker-compose/docker-compose-basic-vpp-nrf.yaml +++ b/docker-compose/docker-compose-basic-vpp-nrf.yaml @@ -22,7 +22,7 @@ services: ipv4_address: 192.168.70.131 oai-udr: container_name: "oai-udr" - image: oaisoftwarealliance/oai-udr:v1.5.0 + image: oaisoftwarealliance/oai-udr:develop environment: - TZ=Europe/Paris - UDR_NAME=OAI_UDR @@ -44,7 +44,7 @@ services: ipv4_address: 192.168.70.136 oai-udm: container_name: "oai-udm" - image: oaisoftwarealliance/oai-udm:v1.5.0 + image: oaisoftwarealliance/oai-udm:develop environment: - TZ=Europe/Paris - UDM_NAME=OAI_UDM @@ -62,7 +62,7 @@ services: ipv4_address: 192.168.70.137 oai-ausf: container_name: "oai-ausf" - image: oaisoftwarealliance/oai-ausf:v1.5.0 + image: oaisoftwarealliance/oai-ausf:develop environment: - TZ=Europe/Paris - AUSF_NAME=OAI_AUSF @@ -80,7 +80,7 @@ services: ipv4_address: 192.168.70.138 oai-nrf: container_name: "oai-nrf" - image: oaisoftwarealliance/oai-nrf:v1.5.0 + image: oaisoftwarealliance/oai-nrf:develop environment: - TZ=Europe/Paris - NRF_INTERFACE_NAME_FOR_SBI=eth0 @@ -89,7 +89,7 @@ services: ipv4_address: 192.168.70.130 oai-amf: container_name: "oai-amf" - image: oaisoftwarealliance/oai-amf:v1.5.0 + image: oaisoftwarealliance/oai-amf:develop environment: - TZ=Europe/paris - MCC=208 @@ -142,7 +142,7 @@ services: ipv4_address: 192.168.70.132 oai-smf: container_name: "oai-smf" - image: oaisoftwarealliance/oai-smf:v1.5.0 + image: oaisoftwarealliance/oai-smf:develop environment: - TZ=Europe/Paris - SMF_INTERFACE_NAME_FOR_N4=eth0 @@ -200,7 +200,7 @@ services: vpp-upf: privileged: true container_name: "vpp-upf" - image: oaisoftwarealliance/oai-upf-vpp:v1.5.0 + image: oaisoftwarealliance/oai-upf-vpp:develop environment: - IF_1_IP=192.168.70.201 - IF_1_TYPE=N4 diff --git a/docker-compose/docker-compose-basic-vpp-pcf-ulcl.yaml b/docker-compose/docker-compose-basic-vpp-pcf-ulcl.yaml index 45aa0c5602a60246734747b773a2f2bc6422417a..241f24fa322bba8467b393ae575bceb3e9aa626e 100644 --- a/docker-compose/docker-compose-basic-vpp-pcf-ulcl.yaml +++ b/docker-compose/docker-compose-basic-vpp-pcf-ulcl.yaml @@ -22,7 +22,7 @@ services: ipv4_address: 192.168.70.131 oai-udr: container_name: "oai-udr" - image: oaisoftwarealliance/oai-udr:v1.5.0 + image: oaisoftwarealliance/oai-udr:develop environment: - TZ=Europe/Paris - INSTANCE=0 @@ -51,7 +51,7 @@ services: ipv4_address: 192.168.70.136 oai-udm: container_name: "oai-udm" - image: oaisoftwarealliance/oai-udm:v1.5.0 + image: oaisoftwarealliance/oai-udm:develop environment: - TZ=Europe/Paris - INSTANCE=0 @@ -77,7 +77,7 @@ services: ipv4_address: 192.168.70.137 oai-ausf: container_name: "oai-ausf" - image: oaisoftwarealliance/oai-ausf:v1.5.0 + image: oaisoftwarealliance/oai-ausf:develop environment: - TZ=Europe/Paris - INSTANCE_ID=0 @@ -102,7 +102,7 @@ services: ipv4_address: 192.168.70.138 oai-nrf: container_name: "oai-nrf" - image: oaisoftwarealliance/oai-nrf:v1.5.0 + image: oaisoftwarealliance/oai-nrf:develop environment: - NRF_INTERFACE_NAME_FOR_SBI=eth0 - NRF_INTERFACE_PORT_FOR_SBI=80 @@ -115,7 +115,7 @@ services: ipv4_address: 192.168.70.130 oai-amf: container_name: "oai-amf" - image: oaisoftwarealliance/oai-amf:v1.5.0 + image: oaisoftwarealliance/oai-amf:develop environment: - TZ=Europe/paris - INSTANCE=0 @@ -188,7 +188,7 @@ services: ipv4_address: 192.168.70.132 oai-smf: container_name: "oai-smf" - image: oaisoftwarealliance/oai-smf:v1.5.0 + image: oaisoftwarealliance/oai-smf:develop environment: - TZ=Europe/Paris - INSTANCE=0 @@ -260,7 +260,7 @@ services: public_net: ipv4_address: 192.168.70.133 oai-pcf: - image: oaisoftwarealliance/oai-pcf:v1.5.0 + image: oaisoftwarealliance/oai-pcf:develop container_name: "oai-pcf" environment: - INSTANCE=0 @@ -291,7 +291,7 @@ services: public_net: ipv4_address: 192.168.70.139 vpp-upf-ulcl: - image: oaisoftwarealliance/oai-upf-vpp:v1.5.0 + image: oaisoftwarealliance/oai-upf-vpp:develop privileged: true container_name: "vpp-upf-ulcl" environment: @@ -341,7 +341,7 @@ services: public_net_core21: ipv4_address: 192.168.74.151 vpp-upf-aupf1: - image: oaisoftwarealliance/oai-upf-vpp:v1.5.0 + image: oaisoftwarealliance/oai-upf-vpp:develop privileged: true container_name: "vpp-upf-aupf1" environment: @@ -386,7 +386,7 @@ services: public_net_core12: ipv4_address: 192.168.75.152 vpp-upf-aupf2: - image: oaisoftwarealliance/oai-upf-vpp:v1.5.0 + image: oaisoftwarealliance/oai-upf-vpp:develop privileged: true container_name: "vpp-upf-aupf2" environment: diff --git a/docker-compose/docker-compose-mini-nonrf.yaml b/docker-compose/docker-compose-mini-nonrf.yaml index e9f1e9ffd124d3e50e9d87a14f31461d093bf14e..66ea8b9a63b4cb01324da0e27899b67333277a54 100644 --- a/docker-compose/docker-compose-mini-nonrf.yaml +++ b/docker-compose/docker-compose-mini-nonrf.yaml @@ -22,7 +22,7 @@ services: ipv4_address: 192.168.70.131 oai-amf: container_name: "oai-amf" - image: oaisoftwarealliance/oai-amf:v1.5.0 + image: oaisoftwarealliance/oai-amf:develop environment: - TZ=Europe/paris - MCC=208 @@ -70,7 +70,7 @@ services: ipv4_address: 192.168.70.132 oai-smf: container_name: "oai-smf" - image: oaisoftwarealliance/oai-smf:v1.5.0 + image: oaisoftwarealliance/oai-smf:develop environment: - TZ=Europe/Paris - SMF_INTERFACE_NAME_FOR_N4=eth0 @@ -120,7 +120,7 @@ services: ipv4_address: 192.168.70.133 oai-spgwu: container_name: "oai-spgwu" - image: oaisoftwarealliance/oai-spgwu-tiny:v1.5.0 + image: oaisoftwarealliance/oai-spgwu-tiny:develop environment: - TZ=Europe/Paris - SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP=eth0 diff --git a/docker-compose/docker-compose-mini-nrf.yaml b/docker-compose/docker-compose-mini-nrf.yaml index a3b4324760220378e2432add94e4bd46e225ad8b..7f6cb11a815383688f7d5ab7f148c702c5b681b9 100644 --- a/docker-compose/docker-compose-mini-nrf.yaml +++ b/docker-compose/docker-compose-mini-nrf.yaml @@ -22,7 +22,7 @@ services: ipv4_address: 192.168.70.131 oai-nrf: container_name: "oai-nrf" - image: oaisoftwarealliance/oai-nrf:v1.5.0 + image: oaisoftwarealliance/oai-nrf:develop environment: - TZ=Europe/Paris - NRF_INTERFACE_NAME_FOR_SBI=eth0 @@ -31,7 +31,7 @@ services: ipv4_address: 192.168.70.130 oai-amf: container_name: "oai-amf" - image: oaisoftwarealliance/oai-amf:v1.5.0 + image: oaisoftwarealliance/oai-amf:develop environment: - TZ=Europe/paris - MCC=208 @@ -85,7 +85,7 @@ services: ipv4_address: 192.168.70.132 oai-smf: container_name: "oai-smf" - image: oaisoftwarealliance/oai-smf:v1.5.0 + image: oaisoftwarealliance/oai-smf:develop environment: - TZ=Europe/Paris - SMF_INTERFACE_NAME_FOR_N4=eth0 @@ -140,7 +140,7 @@ services: ipv4_address: 192.168.70.133 oai-spgwu: container_name: "oai-spgwu" - image: oaisoftwarealliance/oai-spgwu-tiny:v1.5.0 + image: oaisoftwarealliance/oai-spgwu-tiny:develop environment: - TZ=Europe/Paris - SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP=eth0 diff --git a/docker-compose/docker-compose-no-privilege.yaml b/docker-compose/docker-compose-no-privilege.yaml index 83be2d341fa0c68704dd386963ddbd449fdc4933..55481df263b27ff8151c5dbf42f0cb76bff9d501 100644 --- a/docker-compose/docker-compose-no-privilege.yaml +++ b/docker-compose/docker-compose-no-privilege.yaml @@ -23,7 +23,7 @@ services: ipv4_address: 192.168.70.131 oai-nrf: container_name: "oai-nrf" - image: oaisoftwarealliance/oai-nrf:v1.5.0 + image: oaisoftwarealliance/oai-nrf:develop environment: - TZ=Europe/Paris - NRF_INTERFACE_NAME_FOR_SBI=eth0 @@ -32,7 +32,7 @@ services: ipv4_address: 192.168.70.130 oai-amf: container_name: "oai-amf" - image: oaisoftwarealliance/oai-amf:v1.5.0 + image: oaisoftwarealliance/oai-amf:develop environment: - TZ=Europe/paris - MCC=208 @@ -86,7 +86,7 @@ services: ipv4_address: 192.168.70.132 oai-smf: container_name: "oai-smf" - image: oaisoftwarealliance/oai-smf:v1.5.0 + image: oaisoftwarealliance/oai-smf:develop environment: - TZ=Europe/Paris - SMF_INTERFACE_NAME_FOR_N4=eth0 @@ -141,7 +141,7 @@ services: ipv4_address: 192.168.70.133 oai-spgwu: container_name: "oai-spgwu" - image: oaisoftwarealliance/oai-spgwu-tiny:v1.5.0 + image: oaisoftwarealliance/oai-spgwu-tiny:develop environment: - TZ=Europe/Paris - SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP=eth0 diff --git a/docker-compose/docker-compose-slicing-basic-nrf.yaml b/docker-compose/docker-compose-slicing-basic-nrf.yaml index 76fac62ec09459873df00b4f46b3e0ee32f3e1c9..ba47af29704c053eed910f42292f8fca1fbc0c64 100644 --- a/docker-compose/docker-compose-slicing-basic-nrf.yaml +++ b/docker-compose/docker-compose-slicing-basic-nrf.yaml @@ -22,7 +22,7 @@ services: ipv4_address: 192.168.70.131 oai-nssf: container_name: "oai-nssf" - image: oaisoftwarealliance/oai-nssf:v1.5.0 + image: oaisoftwarealliance/oai-nssf:develop environment: - INSTANCE=0 - TZ=Europe/Paris @@ -48,7 +48,7 @@ services: ipv4_address: 192.168.70.132 oai_udr: container_name: oai-udr - image: oaisoftwarealliance/oai-udr:v1.5.0 + image: oaisoftwarealliance/oai-udr:develop environment: - TZ=Europe/Paris - INSTANCE=0 @@ -69,7 +69,7 @@ services: ipv4_address: 192.168.70.133 oai_udm: container_name: oai-udm - image: oaisoftwarealliance/oai-udm:v1.5.0 + image: oaisoftwarealliance/oai-udm:develop environment: - TZ=Europe/Paris - INSTANCE=0 @@ -90,7 +90,7 @@ services: ipv4_address: 192.168.70.134 oai_ausf: container_name: oai-ausf - image: oaisoftwarealliance/oai-ausf:v1.5.0 + image: oaisoftwarealliance/oai-ausf:develop environment: - TZ=Europe/Paris - INSTANCE_ID=0 @@ -110,7 +110,7 @@ services: ipv4_address: 192.168.70.135 oai_nrf_slice12: container_name: oai-nrf-slice12 - image: oaisoftwarealliance/oai-nrf:v1.5.0 + image: oaisoftwarealliance/oai-nrf:develop environment: - NRF_INTERFACE_NAME_FOR_SBI=eth0 - NRF_INTERFACE_PORT_FOR_SBI=80 @@ -123,7 +123,7 @@ services: ipv4_address: 192.168.70.136 oai_nrf_slice3: container_name: oai-nrf-slice3 - image: oaisoftwarealliance/oai-nrf:v1.5.0 + image: oaisoftwarealliance/oai-nrf:develop environment: - NRF_INTERFACE_NAME_FOR_SBI=eth0 - NRF_INTERFACE_PORT_FOR_SBI=80 @@ -136,7 +136,7 @@ services: ipv4_address: 192.168.70.137 oai_amf: container_name: oai-amf - image: oaisoftwarealliance/oai-amf:v1.5.0 + image: oaisoftwarealliance/oai-amf:develop environment: - TZ=Europe/paris - INSTANCE=0 @@ -215,7 +215,7 @@ services: ipv4_address: 192.168.70.138 oai_smf_slice1: container_name: oai-smf-slice1 - image: oaisoftwarealliance/oai-smf:v1.5.0 + image: oaisoftwarealliance/oai-smf:develop environment: - TZ=Europe/Paris - INSTANCE=0 @@ -262,7 +262,7 @@ services: ipv4_address: 192.168.70.139 oai_smf_slice2: container_name: oai-smf-slice2 - image: oaisoftwarealliance/oai-smf:v1.5.0 + image: oaisoftwarealliance/oai-smf:develop environment: - TZ=Europe/Paris - INSTANCE=0 @@ -308,7 +308,7 @@ services: ipv4_address: 192.168.70.140 oai_smf_slice3: container_name: oai-smf-slice3 - image: oaisoftwarealliance/oai-smf:v1.5.0 + image: oaisoftwarealliance/oai-smf:develop environment: - TZ=Europe/Paris - INSTANCE=0 @@ -357,7 +357,7 @@ services: ipv4_address: 192.168.70.141 oai_spgwu_slice1: container_name: oai-spgwu-slice1 - image: oaisoftwarealliance/oai-spgwu-tiny:v1.5.0 + image: oaisoftwarealliance/oai-spgwu-tiny:develop environment: - TZ=Europe/Paris - PID_DIRECTORY=/var/run @@ -398,7 +398,7 @@ services: ipv4_address: 192.168.70.142 oai_spgwu_slice2: container_name: oai-spgwu-slice2 - image: oaisoftwarealliance/oai-spgwu-tiny:v1.5.0 + image: oaisoftwarealliance/oai-spgwu-tiny:develop environment: - TZ=Europe/Paris - PID_DIRECTORY=/var/run @@ -436,7 +436,7 @@ services: public_net: ipv4_address: 192.168.70.143 vpp_upf_slice3: - image: oaisoftwarealliance/oai-upf-vpp:v1.5.0 + image: oaisoftwarealliance/oai-upf-vpp:develop privileged: true container_name: vpp-upf-slice3 environment: