Skip to content
Snippets Groups Projects
Commit a3ce6fec authored by Raphael Defosseux's avatar Raphael Defosseux
Browse files

doc(release): switching all tutorials to use v2.1.0 images 


Signed-off-by: default avatarRaphael Defosseux <raphael.defosseux@eurecom.fr>
parent 1785beb9
No related branches found
No related tags found
1 merge request!179documentation for Release v2.1.0
Hide whitespace changes
Inline Side-by-side
Showing
with 76 additions and 111 deletions
ci-scripts/Jenkinsfile-GitLab-COTS-UE-Test
+ 0
− 7
View file @ a3ce6fec
...@@ -118,13 +118,6 @@ pipeline { ...@@ -118,13 +118,6 @@ pipeline {
if (ii == SMF) { if (ii == SMF) {
branchNames[SMF] = params.SMF_BRANCH branchNames[SMF] = params.SMF_BRANCH
baseTags[SMF] = params.SMF_TAG baseTags[SMF] = params.SMF_TAG
// TODO: temporary work-around until UPF v2.1.0 released
if (upstreamEvent && upstreamJobs[UPF]) {
branchNames[SMF] = 'master'
baseTags[SMF] = 'v2.1.0'
echo "SMF_TAG to use: ${baseTags[SMF]}"
echo "SMF_BRANCH to use: ${branchNames[SMF]}"
}
} }
if (ii == UPF) { if (ii == UPF) {
branchNames[UPF] = params.UPF_BRANCH branchNames[UPF] = params.UPF_BRANCH
......
ci-scripts/Jenkinsfile-GitLab-Load-Check
+ 1
− 8
View file @ a3ce6fec
...@@ -135,13 +135,6 @@ pipeline { ...@@ -135,13 +135,6 @@ pipeline {
echo "Upstream Job passed SMF_TAG to use: ${imageTags[SMF]}" echo "Upstream Job passed SMF_TAG to use: ${imageTags[SMF]}"
echo "Upstream Job passed SMF_BRANCH to use: ${branchNames[SMF]}" echo "Upstream Job passed SMF_BRANCH to use: ${branchNames[SMF]}"
} }
// TODO: temporary work-around until UPF v2.1.0 released
if (upstreamEvent && upstreamJobs[UPF]) {
branchNames[SMF] = 'master'
imageTags[SMF] = 'v2.1.0'
echo "SMF_TAG to use: ${imageTags[SMF]}"
echo "SMF_BRANCH to use: ${branchNames[SMF]}"
}
} }
if (ii == UPF) { if (ii == UPF) {
branchNames[UPF] = params.UPF_BRANCH branchNames[UPF] = params.UPF_BRANCH
...@@ -566,7 +559,7 @@ def checkImageInfo(imageName, origTag) { ...@@ -566,7 +559,7 @@ def checkImageInfo(imageName, origTag) {
def updateDockerCompose(filename, lRanTag) { def updateDockerCompose(filename, lRanTag) {
for (ii = 0; ii < imageNames.size(); ii++) { for (ii = 0; ii < imageNames.size(); ii++) {
sh 'sed -i -e "s@oaisoftwarealliance/' + imageNames[ii] + ':develop@' + imageNames[ii] + ':' + imageTags[ii] + '@" ' + filename sh 'sed -i -e "s@oaisoftwarealliance/' + imageNames[ii] + ':v2.1.0@' + imageNames[ii] + ':' + imageTags[ii] + '@" ' + filename
} }
sh 'sed -i -e "s@oaisoftwarealliance/trf-gen-cn5g:latest@trf-gen-cn5g:latest@" ' + filename sh 'sed -i -e "s@oaisoftwarealliance/trf-gen-cn5g:latest@trf-gen-cn5g:latest@" ' + filename
sh 'sed -i -e "s@5gc-gnbsim:tag-to-use@5gc-gnbsim:' + lRanTag + '@" ci-scripts/docker-compose/load-test-gnbsim/docker-compose-omec-gnbsim.yaml' sh 'sed -i -e "s@5gc-gnbsim:tag-to-use@5gc-gnbsim:' + lRanTag + '@" ci-scripts/docker-compose/load-test-gnbsim/docker-compose-omec-gnbsim.yaml'
......
ci-scripts/Jenkinsfile-GitLab-RobotTests
+ 0
− 7
View file @ a3ce6fec
...@@ -193,13 +193,6 @@ pipeline { ...@@ -193,13 +193,6 @@ pipeline {
echo "Upstream Job passed SMF_TAG to use: ${imageTags[SMF]}" echo "Upstream Job passed SMF_TAG to use: ${imageTags[SMF]}"
echo "Upstream Job passed SMF_BRANCH to use: ${branchNames[SMF]}" echo "Upstream Job passed SMF_BRANCH to use: ${branchNames[SMF]}"
} }
// TODO: temporary work-around until UPF v2.1.0 released
if (upstreamEvent && upstreamJobs[UPF]) {
branchNames[SMF] = 'master'
imageTags[SMF] = 'v2.1.0'
echo "SMF_TAG to use: ${imageTags[SMF]}"
echo "SMF_BRANCH to use: ${branchNames[SMF]}"
}
} }
if (ii == UPF) { if (ii == UPF) {
branchNames[UPF] = params.UPF_BRANCH branchNames[UPF] = params.UPF_BRANCH
......
ci-scripts/Jenkinsfile-GitLab-Tutorial-Check
+ 1
− 8
View file @ a3ce6fec
...@@ -168,13 +168,6 @@ pipeline { ...@@ -168,13 +168,6 @@ pipeline {
run_ulcl_pcf = true run_ulcl_pcf = true
run_mongo_db = false run_mongo_db = false
} }
// TODO: temporary work-around until UPF v2.1.0 released
if (upstreamEvent && upstreamJobs[UPF]) {
branchNames[SMF] = 'master'
imageTags[SMF] = 'v2.1.0'
echo "SMF_TAG to use: ${imageTags[SMF]}"
echo "SMF_BRANCH to use: ${branchNames[SMF]}"
}
} }
if (ii == UPF) { if (ii == UPF) {
branchNames[UPF] = params.UPF_BRANCH branchNames[UPF] = params.UPF_BRANCH
...@@ -509,7 +502,7 @@ def checkImageInfo(imageName, origTag) { ...@@ -509,7 +502,7 @@ def checkImageInfo(imageName, origTag) {
def updateDockerCompose(filename, lRanTag) { def updateDockerCompose(filename, lRanTag) {
for (ii = 0; ii < imageNames.size(); ii++) { for (ii = 0; ii < imageNames.size(); ii++) {
sh 'sed -i -e "s@oaisoftwarealliance/' + imageNames[ii] + ':develop@' + imageNames[ii] + ':' + imageTags[ii] + '@" ' + filename sh 'sed -i -e "s@oaisoftwarealliance/' + imageNames[ii] + ':v2.1.0@' + imageNames[ii] + ':' + imageTags[ii] + '@" ' + filename
} }
sh 'sed -i -e "s@oaisoftwarealliance/trf-gen-cn5g:latest@trf-gen-cn5g:latest@" ' + filename sh 'sed -i -e "s@oaisoftwarealliance/trf-gen-cn5g:latest@trf-gen-cn5g:latest@" ' + filename
// Using the develop variant of gnbsim // Using the develop variant of gnbsim
......
ci-scripts/Jenkinsfile-GitLab-Tutorial-Check-eBPF
+ 1
− 8
View file @ a3ce6fec
...@@ -148,13 +148,6 @@ pipeline { ...@@ -148,13 +148,6 @@ pipeline {
echo "Upstream Job passed SMF_BRANCH to use: ${branchNames[SMF]}" echo "Upstream Job passed SMF_BRANCH to use: ${branchNames[SMF]}"
run_ebpf_upf = true run_ebpf_upf = true
} }
// TODO: temporary work-around until UPF v2.1.0 released
if (upstreamEvent && upstreamJobs[UPF]) {
branchNames[SMF] = 'master'
imageTags[SMF] = 'v2.1.0'
echo "SMF_TAG to use: ${imageTags[SMF]}"
echo "SMF_BRANCH to use: ${branchNames[SMF]}"
}
} }
if (ii == UPF) { if (ii == UPF) {
branchNames[UPF] = params.UPF_BRANCH branchNames[UPF] = params.UPF_BRANCH
...@@ -345,7 +338,7 @@ def checkImageInfo(imageName, origTag) { ...@@ -345,7 +338,7 @@ def checkImageInfo(imageName, origTag) {
def updateDockerCompose(filename, lRanTag) { def updateDockerCompose(filename, lRanTag) {
for (ii = 0; ii < imageNames.size(); ii++) { for (ii = 0; ii < imageNames.size(); ii++) {
sh 'sed -i -e "s@oaisoftwarealliance/' + imageNames[ii] + ':develop@' + imageNames[ii] + ':' + imageTags[ii] + '@" ' + filename sh 'sed -i -e "s@oaisoftwarealliance/' + imageNames[ii] + ':v2.1.0@' + imageNames[ii] + ':' + imageTags[ii] + '@" ' + filename
} }
sh 'sed -i -e "s@oaisoftwarealliance/trf-gen-cn5g:latest@trf-gen-cn5g:latest@" ' + filename sh 'sed -i -e "s@oaisoftwarealliance/trf-gen-cn5g:latest@trf-gen-cn5g:latest@" ' + filename
// Using the develop variant of gnbsim // Using the develop variant of gnbsim
......
docker-compose/docker-compose-basic-nrf-ebpf.yaml
+ 7
− 7
View file @ a3ce6fec
...@@ -22,7 +22,7 @@ services: ...@@ -22,7 +22,7 @@ services:
ipv4_address: 192.168.70.131 ipv4_address: 192.168.70.131
oai-udr: oai-udr:
container_name: "oai-udr" container_name: "oai-udr"
image: oaisoftwarealliance/oai-udr:develop image: oaisoftwarealliance/oai-udr:v2.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -38,7 +38,7 @@ services: ...@@ -38,7 +38,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.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -53,7 +53,7 @@ services: ...@@ -53,7 +53,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.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -68,7 +68,7 @@ services: ...@@ -68,7 +68,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.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -81,7 +81,7 @@ services: ...@@ -81,7 +81,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.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -97,7 +97,7 @@ services: ...@@ -97,7 +97,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.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -115,7 +115,7 @@ services: ...@@ -115,7 +115,7 @@ services:
- "oai-upf:192.168.70.129" - "oai-upf:192.168.70.129"
oai-upf: oai-upf:
container_name: "oai-upf" container_name: "oai-upf"
image: oaisoftwarealliance/oai-upf:develop image: oaisoftwarealliance/oai-upf:v2.1.0
expose: expose:
- 2152/udp - 2152/udp
- 8805/udp - 8805/udp
......
docker-compose/docker-compose-basic-nrf-mongodb.yaml
+ 7
− 7
View file @ a3ce6fec
...@@ -21,7 +21,7 @@ services: ...@@ -21,7 +21,7 @@ services:
ipv4_address: 192.168.70.131 ipv4_address: 192.168.70.131
oai-udr: oai-udr:
container_name: "oai-udr" container_name: "oai-udr"
image: oaisoftwarealliance/oai-udr:develop image: oaisoftwarealliance/oai-udr:v2.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -37,7 +37,7 @@ services: ...@@ -37,7 +37,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.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -52,7 +52,7 @@ services: ...@@ -52,7 +52,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.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -67,7 +67,7 @@ services: ...@@ -67,7 +67,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.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -80,7 +80,7 @@ services: ...@@ -80,7 +80,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.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -96,7 +96,7 @@ services: ...@@ -96,7 +96,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.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -112,7 +112,7 @@ services: ...@@ -112,7 +112,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.1.0
expose: expose:
- 2152/udp - 2152/udp
- 8805/udp - 8805/udp
......
docker-compose/docker-compose-basic-nrf.yaml
+ 7
− 7
View file @ a3ce6fec
...@@ -23,7 +23,7 @@ services: ...@@ -23,7 +23,7 @@ services:
# ipv4_address: 192.168.70.131 # ipv4_address: 192.168.70.131
oai-udr: oai-udr:
container_name: "oai-udr" container_name: "oai-udr"
image: oaisoftwarealliance/oai-udr:develop image: oaisoftwarealliance/oai-udr:v2.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -40,7 +40,7 @@ services: ...@@ -40,7 +40,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.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -56,7 +56,7 @@ services: ...@@ -56,7 +56,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.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -72,7 +72,7 @@ services: ...@@ -72,7 +72,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.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -86,7 +86,7 @@ services: ...@@ -86,7 +86,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.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -103,7 +103,7 @@ services: ...@@ -103,7 +103,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.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -120,7 +120,7 @@ services: ...@@ -120,7 +120,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.1.0
expose: expose:
- 2152/udp - 2152/udp
- 8805/udp - 8805/udp
......
docker-compose/docker-compose-basic-vpp-nrf.yaml
+ 7
− 7
View file @ a3ce6fec
...@@ -22,7 +22,7 @@ services: ...@@ -22,7 +22,7 @@ services:
ipv4_address: 192.168.70.131 ipv4_address: 192.168.70.131
oai-udr: oai-udr:
container_name: "oai-udr" container_name: "oai-udr"
image: oaisoftwarealliance/oai-udr:develop image: oaisoftwarealliance/oai-udr:v2.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -38,7 +38,7 @@ services: ...@@ -38,7 +38,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.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -53,7 +53,7 @@ services: ...@@ -53,7 +53,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.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -68,7 +68,7 @@ services: ...@@ -68,7 +68,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.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -81,7 +81,7 @@ services: ...@@ -81,7 +81,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.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -97,7 +97,7 @@ services: ...@@ -97,7 +97,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.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -116,7 +116,7 @@ services: ...@@ -116,7 +116,7 @@ services:
vpp-upf: vpp-upf:
privileged: true privileged: true
container_name: "vpp-upf" container_name: "vpp-upf"
image: oaisoftwarealliance/oai-upf-vpp:develop image: oaisoftwarealliance/oai-upf-vpp:v2.1.0
environment: environment:
- IF_1_IP=192.168.70.201 - IF_1_IP=192.168.70.201
- IF_1_TYPE=N4 - IF_1_TYPE=N4
......
docker-compose/docker-compose-basic-vpp-pcf-redirection.yaml
+ 8
− 8
View file @ a3ce6fec
...@@ -22,7 +22,7 @@ services: ...@@ -22,7 +22,7 @@ services:
ipv4_address: 192.168.70.131 ipv4_address: 192.168.70.131
oai-udr: oai-udr:
container_name: "oai-udr" container_name: "oai-udr"
image: oaisoftwarealliance/oai-udr:develop image: oaisoftwarealliance/oai-udr:v2.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -38,7 +38,7 @@ services: ...@@ -38,7 +38,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.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -53,7 +53,7 @@ services: ...@@ -53,7 +53,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.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -68,7 +68,7 @@ services: ...@@ -68,7 +68,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.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -81,7 +81,7 @@ services: ...@@ -81,7 +81,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.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -100,7 +100,7 @@ services: ...@@ -100,7 +100,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.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -118,7 +118,7 @@ services: ...@@ -118,7 +118,7 @@ services:
ipv4_address: 192.168.70.133 ipv4_address: 192.168.70.133
oai-pcf: oai-pcf:
container_name: "oai-pcf" container_name: "oai-pcf"
image: oaisoftwarealliance/oai-pcf:develop image: oaisoftwarealliance/oai-pcf:v2.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -135,7 +135,7 @@ services: ...@@ -135,7 +135,7 @@ services:
vpp-upf: vpp-upf:
privileged: true privileged: true
container_name: "vpp-upf" container_name: "vpp-upf"
image: oaisoftwarealliance/oai-upf-vpp:develop image: oaisoftwarealliance/oai-upf-vpp:v2.1.0
environment: environment:
- IF_1_IP=192.168.70.201 - IF_1_IP=192.168.70.201
- IF_1_TYPE=N4 - IF_1_TYPE=N4
......
docker-compose/docker-compose-basic-vpp-pcf-steering.yaml
+ 8
− 8
View file @ a3ce6fec
...@@ -22,7 +22,7 @@ services: ...@@ -22,7 +22,7 @@ services:
ipv4_address: 192.168.70.131 ipv4_address: 192.168.70.131
oai-udr: oai-udr:
container_name: "oai-udr" container_name: "oai-udr"
image: oaisoftwarealliance/oai-udr:develop image: oaisoftwarealliance/oai-udr:v2.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -38,7 +38,7 @@ services: ...@@ -38,7 +38,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.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -53,7 +53,7 @@ services: ...@@ -53,7 +53,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.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -68,7 +68,7 @@ services: ...@@ -68,7 +68,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.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -81,7 +81,7 @@ services: ...@@ -81,7 +81,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.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -100,7 +100,7 @@ services: ...@@ -100,7 +100,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.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -118,7 +118,7 @@ services: ...@@ -118,7 +118,7 @@ services:
ipv4_address: 192.168.70.133 ipv4_address: 192.168.70.133
oai-pcf: oai-pcf:
container_name: "oai-pcf" container_name: "oai-pcf"
image: oaisoftwarealliance/oai-pcf:develop image: oaisoftwarealliance/oai-pcf:v2.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -135,7 +135,7 @@ services: ...@@ -135,7 +135,7 @@ services:
vpp-upf: vpp-upf:
privileged: true privileged: true
container_name: "vpp-upf" container_name: "vpp-upf"
image: oaisoftwarealliance/oai-upf-vpp:develop image: oaisoftwarealliance/oai-upf-vpp:v2.1.0
environment: environment:
- IF_1_IP=192.168.70.201 - IF_1_IP=192.168.70.201
- IF_1_TYPE=N4 - IF_1_TYPE=N4
......
docker-compose/docker-compose-basic-vpp-pcf-ulcl.yaml
+ 10
− 10
View file @ a3ce6fec
...@@ -22,7 +22,7 @@ services: ...@@ -22,7 +22,7 @@ services:
ipv4_address: 192.168.70.131 ipv4_address: 192.168.70.131
oai-udr: oai-udr:
container_name: "oai-udr" container_name: "oai-udr"
image: oaisoftwarealliance/oai-udr:develop image: oaisoftwarealliance/oai-udr:v2.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -38,7 +38,7 @@ services: ...@@ -38,7 +38,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.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -53,7 +53,7 @@ services: ...@@ -53,7 +53,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.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -68,7 +68,7 @@ services: ...@@ -68,7 +68,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.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -81,7 +81,7 @@ services: ...@@ -81,7 +81,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.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -98,7 +98,7 @@ services: ...@@ -98,7 +98,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.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -118,7 +118,7 @@ services: ...@@ -118,7 +118,7 @@ services:
ipv4_address: 192.168.70.133 ipv4_address: 192.168.70.133
oai-pcf: oai-pcf:
container_name: "oai-pcf" container_name: "oai-pcf"
image: oaisoftwarealliance/oai-pcf:develop image: oaisoftwarealliance/oai-pcf:v2.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -134,7 +134,7 @@ services: ...@@ -134,7 +134,7 @@ services:
ipv4_address: 192.168.70.139 ipv4_address: 192.168.70.139
vpp-upf-ulcl: vpp-upf-ulcl:
container_name: "vpp-upf-ulcl" container_name: "vpp-upf-ulcl"
image: oaisoftwarealliance/oai-upf-vpp:develop image: oaisoftwarealliance/oai-upf-vpp:v2.1.0
privileged: true privileged: true
environment: environment:
- IF_1_IP=192.168.70.201 - IF_1_IP=192.168.70.201
...@@ -184,7 +184,7 @@ services: ...@@ -184,7 +184,7 @@ services:
public_net_core21: public_net_core21:
ipv4_address: 192.168.74.151 ipv4_address: 192.168.74.151
vpp-upf-aupf1: vpp-upf-aupf1:
image: oaisoftwarealliance/oai-upf-vpp:develop image: oaisoftwarealliance/oai-upf-vpp:v2.1.0
privileged: true privileged: true
container_name: "vpp-upf-aupf1" container_name: "vpp-upf-aupf1"
environment: environment:
...@@ -230,7 +230,7 @@ services: ...@@ -230,7 +230,7 @@ services:
public_net_core12: public_net_core12:
ipv4_address: 192.168.75.152 ipv4_address: 192.168.75.152
vpp-upf-aupf2: vpp-upf-aupf2:
image: oaisoftwarealliance/oai-upf-vpp:develop image: oaisoftwarealliance/oai-upf-vpp:v2.1.0
privileged: true privileged: true
container_name: "vpp-upf-aupf2" container_name: "vpp-upf-aupf2"
environment: environment:
......
docker-compose/docker-compose-mini-nonrf.yaml
+ 3
− 3
View file @ a3ce6fec
...@@ -22,7 +22,7 @@ services: ...@@ -22,7 +22,7 @@ services:
ipv4_address: 192.168.70.131 ipv4_address: 192.168.70.131
oai-amf: oai-amf:
container_name: "oai-amf" container_name: "oai-amf"
image: oaisoftwarealliance/oai-amf:develop image: oaisoftwarealliance/oai-amf:v2.1.0
volumes: volumes:
- ./conf/mini_nonrf_config.yaml:/openair-amf/etc/config.yaml - ./conf/mini_nonrf_config.yaml:/openair-amf/etc/config.yaml
environment: environment:
...@@ -34,7 +34,7 @@ services: ...@@ -34,7 +34,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.1.0
volumes: volumes:
- ./conf/mini_nonrf_config.yaml:/openair-smf/etc/config.yaml - ./conf/mini_nonrf_config.yaml:/openair-smf/etc/config.yaml
environment: environment:
...@@ -49,7 +49,7 @@ services: ...@@ -49,7 +49,7 @@ services:
- "oai-upf:192.168.70.134" - "oai-upf:192.168.70.134"
oai-upf: oai-upf:
container_name: "oai-upf" container_name: "oai-upf"
image: oaisoftwarealliance/oai-upf:develop image: oaisoftwarealliance/oai-upf:v2.1.0
volumes: volumes:
- ./conf/mini_nonrf_config.yaml:/openair-upf/etc/config.yaml - ./conf/mini_nonrf_config.yaml:/openair-upf/etc/config.yaml
environment: environment:
......
docker-compose/docker-compose-no-privilege.yaml
+ 3
− 3
View file @ a3ce6fec
...@@ -23,7 +23,7 @@ services: ...@@ -23,7 +23,7 @@ services:
ipv4_address: 192.168.70.131 ipv4_address: 192.168.70.131
oai-amf: oai-amf:
container_name: "oai-amf" container_name: "oai-amf"
image: oaisoftwarealliance/oai-amf:develop image: oaisoftwarealliance/oai-amf:v2.1.0
volumes: volumes:
- ./conf/mini_nonrf_config.yaml:/openair-amf/etc/config.yaml - ./conf/mini_nonrf_config.yaml:/openair-amf/etc/config.yaml
environment: environment:
...@@ -35,7 +35,7 @@ services: ...@@ -35,7 +35,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.1.0
volumes: volumes:
- ./conf/mini_nonrf_config.yaml:/openair-smf/etc/config.yaml - ./conf/mini_nonrf_config.yaml:/openair-smf/etc/config.yaml
environment: environment:
...@@ -50,7 +50,7 @@ services: ...@@ -50,7 +50,7 @@ services:
- "oai-upf:192.168.70.134" - "oai-upf:192.168.70.134"
oai-upf: oai-upf:
container_name: "oai-upf" container_name: "oai-upf"
image: oaisoftwarealliance/oai-upf:develop image: oaisoftwarealliance/oai-upf:v2.1.0
volumes: volumes:
- ./conf/mini_nonrf_config.yaml:/openair-upf/etc/config.yaml - ./conf/mini_nonrf_config.yaml:/openair-upf/etc/config.yaml
environment: environment:
......
docker-compose/docker-compose-slicing-basic-nrf.yaml
+ 13
− 13
View file @ a3ce6fec
...@@ -22,7 +22,7 @@ services: ...@@ -22,7 +22,7 @@ services:
ipv4_address: 192.168.70.131 ipv4_address: 192.168.70.131
oai-nssf: oai-nssf:
container_name: "oai-nssf" container_name: "oai-nssf"
image: oaisoftwarealliance/oai-nssf:develop image: oaisoftwarealliance/oai-nssf:v2.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -40,7 +40,7 @@ services: ...@@ -40,7 +40,7 @@ services:
ipv4_address: 192.168.70.132 ipv4_address: 192.168.70.132
oai_udr: oai_udr:
container_name: "oai-udr" container_name: "oai-udr"
image: oaisoftwarealliance/oai-udr:develop image: oaisoftwarealliance/oai-udr:v2.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -53,7 +53,7 @@ services: ...@@ -53,7 +53,7 @@ services:
ipv4_address: 192.168.70.133 ipv4_address: 192.168.70.133
oai_udm: oai_udm:
container_name: "oai-udm" container_name: "oai-udm"
image: oaisoftwarealliance/oai-udm:develop image: oaisoftwarealliance/oai-udm:v2.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -66,7 +66,7 @@ services: ...@@ -66,7 +66,7 @@ services:
ipv4_address: 192.168.70.134 ipv4_address: 192.168.70.134
oai_ausf: oai_ausf:
container_name: "oai-ausf" container_name: "oai-ausf"
image: oaisoftwarealliance/oai-ausf:develop image: oaisoftwarealliance/oai-ausf:v2.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -79,7 +79,7 @@ services: ...@@ -79,7 +79,7 @@ services:
ipv4_address: 192.168.70.135 ipv4_address: 192.168.70.135
oai_nrf_slice12: oai_nrf_slice12:
container_name: "oai-nrf-slice12" container_name: "oai-nrf-slice12"
image: oaisoftwarealliance/oai-nrf:develop image: oaisoftwarealliance/oai-nrf:v2.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -90,7 +90,7 @@ services: ...@@ -90,7 +90,7 @@ services:
ipv4_address: 192.168.70.136 ipv4_address: 192.168.70.136
oai_nrf_slice3: oai_nrf_slice3:
container_name: "oai-nrf-slice3" container_name: "oai-nrf-slice3"
image: oaisoftwarealliance/oai-nrf:develop image: oaisoftwarealliance/oai-nrf:v2.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -101,7 +101,7 @@ services: ...@@ -101,7 +101,7 @@ services:
ipv4_address: 192.168.70.137 ipv4_address: 192.168.70.137
oai_amf: oai_amf:
container_name: "oai-amf" container_name: "oai-amf"
image: oaisoftwarealliance/oai-amf:develop image: oaisoftwarealliance/oai-amf:v2.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -117,7 +117,7 @@ services: ...@@ -117,7 +117,7 @@ services:
ipv4_address: 192.168.70.138 ipv4_address: 192.168.70.138
oai_smf_slice1: oai_smf_slice1:
container_name: "oai-smf-slice1" container_name: "oai-smf-slice1"
image: oaisoftwarealliance/oai-smf:develop image: oaisoftwarealliance/oai-smf:v2.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -132,7 +132,7 @@ services: ...@@ -132,7 +132,7 @@ services:
ipv4_address: 192.168.70.139 ipv4_address: 192.168.70.139
oai_smf_slice2: oai_smf_slice2:
container_name: "oai-smf-slice2" container_name: "oai-smf-slice2"
image: oaisoftwarealliance/oai-smf:develop image: oaisoftwarealliance/oai-smf:v2.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -147,7 +147,7 @@ services: ...@@ -147,7 +147,7 @@ services:
ipv4_address: 192.168.70.140 ipv4_address: 192.168.70.140
oai_smf_slice3: oai_smf_slice3:
container_name: "oai-smf-slice3" container_name: "oai-smf-slice3"
image: oaisoftwarealliance/oai-smf:develop image: oaisoftwarealliance/oai-smf:v2.1.0
expose: expose:
- 80/tcp - 80/tcp
- 8080/tcp - 8080/tcp
...@@ -164,7 +164,7 @@ services: ...@@ -164,7 +164,7 @@ services:
ipv4_address: 192.168.70.141 ipv4_address: 192.168.70.141
oai_upf_slice1: oai_upf_slice1:
container_name: "oai-upf-slice1" container_name: "oai-upf-slice1"
image: oaisoftwarealliance/oai-upf:develop image: oaisoftwarealliance/oai-upf:v2.1.0
expose: expose:
- 2152/udp - 2152/udp
- 8805/udp - 8805/udp
...@@ -187,7 +187,7 @@ services: ...@@ -187,7 +187,7 @@ services:
ipv4_address: 192.168.70.142 ipv4_address: 192.168.70.142
oai_upf_slice2: oai_upf_slice2:
container_name: "oai-upf-slice2" container_name: "oai-upf-slice2"
image: oaisoftwarealliance/oai-upf:develop image: oaisoftwarealliance/oai-upf:v2.1.0
expose: expose:
- 2152/udp - 2152/udp
- 8805/udp - 8805/udp
...@@ -210,7 +210,7 @@ services: ...@@ -210,7 +210,7 @@ services:
ipv4_address: 192.168.70.143 ipv4_address: 192.168.70.143
vpp_upf_slice3: vpp_upf_slice3:
container_name: "vpp-upf-slice3" container_name: "vpp-upf-slice3"
image: oaisoftwarealliance/oai-upf-vpp:develop image: oaisoftwarealliance/oai-upf-vpp:v2.1.0
privileged: true privileged: true
environment: environment:
- IF_1_IP=192.168.70.201 - IF_1_IP=192.168.70.201
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment