From 4b92fb2cfeaf4d8933306bc4ca38391858772d6f Mon Sep 17 00:00:00 2001
From: Raphael Defosseux <raphael.defosseux@eurecom.fr>
Date: Fri, 10 Mar 2023 13:13:03 +0100
Subject: [PATCH] feat(ci): starting from this commit:
* The tutorials on the `master` branch won't work with the v1.5.0 released images
* The configuration system / variable may have changed
If you want to use the tutorials with v1.5.0 images, rebase the tutorials with:
* Either the release tag : `git checkout -f v1.5.0`
* Or the latest valid weekly tag: `git checkout -f 2023.w10`
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
---
ci-scripts/Jenkinsfile-GitLab-Load-Check | 2 +-
ci-scripts/Jenkinsfile-GitLab-Tutorial-Check | 2 +-
.../docker-compose-basic-nonrf.yaml | 12 ++++-----
.../docker-compose-basic-nrf-http2.yaml | 14 +++++-----
docker-compose/docker-compose-basic-nrf.yaml | 14 +++++-----
.../docker-compose-basic-vpp-nonrf.yaml | 12 ++++-----
.../docker-compose-basic-vpp-nrf-http2.yaml | 14 +++++-----
.../docker-compose-basic-vpp-nrf.yaml | 14 +++++-----
.../docker-compose-basic-vpp-pcf-ulcl.yaml | 20 +++++++-------
docker-compose/docker-compose-mini-nonrf.yaml | 6 ++---
docker-compose/docker-compose-mini-nrf.yaml | 8 +++---
.../docker-compose-no-privilege.yaml | 8 +++---
.../docker-compose-slicing-basic-nrf.yaml | 26 +++++++++----------
13 files changed, 76 insertions(+), 76 deletions(-)
diff --git a/ci-scripts/Jenkinsfile-GitLab-Load-Check b/ci-scripts/Jenkinsfile-GitLab-Load-Check
index df42afde..7b0e311f 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 e58ef30f..8a5e86cb 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 ff64fb20..c17cad2c 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 09fe15ee..3f4a3a97 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 a72e476e..6f16ef24 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 fed99d00..7073b6ad 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 42bb7a7d..d273abf3 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 2c960aae..77c3d71e 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 45aa0c56..241f24fa 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 e9f1e9ff..66ea8b9a 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 a3b43247..7f6cb11a 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 83be2d34..55481df2 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 76fac62e..ba47af29 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:
--
GitLab