From 2e2268bb0c0560b26c7345de1f9559aaa5521d67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Pont=C3=B3n=20Rodr=C3=ADguez?= <135843011+jpontongradiant@users.noreply.github.com> Date: Thu, 4 Jul 2024 10:17:23 +0200 Subject: [PATCH] Bugs fixed (#263) --- docs/open5gs-and-srsran-4g-usrp/epc.yaml | 18 +- docs/open5gs-and-srsran-4g/README.md | 2 +- docs/open5gs-and-srsran-4g/epc.yaml | 18 +- .../register_subscriber.sh | 4 +- docs/open5gs-and-srsran-5g/core.yaml | 26 +- docs/open5gs-and-ueransim/README.md | 3 +- docs/open5gs-and-ueransim/config/smf.yaml | 356 ++++++++++++++++++ docs/open5gs-and-ueransim/ngc.yaml | 27 +- images/open5gs/configs/open5gs/amf.yaml | 3 +- images/open5gs/configs/open5gs/ausf.yaml | 3 +- images/open5gs/configs/open5gs/bsf.yaml | 3 +- images/open5gs/configs/open5gs/hss.yaml | 3 +- images/open5gs/configs/open5gs/mme.yaml | 3 +- images/open5gs/configs/open5gs/nrf.yaml | 3 +- images/open5gs/configs/open5gs/nssf.yaml | 3 +- images/open5gs/configs/open5gs/pcf.yaml | 3 +- images/open5gs/configs/open5gs/pcrf.yaml | 3 +- images/open5gs/configs/open5gs/scp.yaml | 3 +- images/open5gs/configs/open5gs/sgwc.yaml | 3 +- images/open5gs/configs/open5gs/sgwu.yaml | 3 +- images/open5gs/configs/open5gs/smf.yaml | 3 +- images/open5gs/configs/open5gs/udm.yaml | 3 +- images/open5gs/configs/open5gs/udr.yaml | 3 +- images/open5gs/configs/open5gs/upf.yaml | 3 +- images/srsran-5g/Dockerfile | 21 +- 25 files changed, 450 insertions(+), 73 deletions(-) create mode 100644 docs/open5gs-and-ueransim/config/smf.yaml diff --git a/docs/open5gs-and-srsran-4g-usrp/epc.yaml b/docs/open5gs-and-srsran-4g-usrp/epc.yaml index a5d510d..8ad8329 100644 --- a/docs/open5gs-and-srsran-4g-usrp/epc.yaml +++ b/docs/open5gs-and-srsran-4g-usrp/epc.yaml @@ -5,7 +5,7 @@ services: environment: MONGO_INITDB_DATABASE: open5gs webui: - image: gradiant/open5gs-webui:2.7.0 + image: gradiant/open5gs-webui:2.7.1 restart: on-failure environment: DB_URI: mongodb://mongo/open5gs @@ -13,11 +13,11 @@ services: ports: - 9999:9999 smf: - image: gradiant/open5gs:2.7.0 + image: gradiant/open5gs:2.7.1 command: open5gs-smfd restart : on-failure mme: - image: gradiant/open5gs:2.7.0 + image: gradiant/open5gs:2.7.1 volumes: - ./config/mme.yaml:/opt/open5gs/etc/open5gs/mme.yaml command: open5gs-mmed @@ -25,15 +25,15 @@ services: ports: - 36412:36412 sgwc: - image: gradiant/open5gs:2.7.0 + image: gradiant/open5gs:2.7.1 command: open5gs-sgwcd restart : on-failure sgwu: - image: gradiant/open5gs:2.7.0 + image: gradiant/open5gs:2.7.1 command: open5gs-sgwud restart : on-failure upf: - image: gradiant/open5gs:2.7.0 + image: gradiant/open5gs:2.7.1 command: ["open5gs-upfd"] cap_add: - all @@ -42,18 +42,18 @@ services: ports: - 2152:2152 pcrf: - image: gradiant/open5gs:2.7.0 + image: gradiant/open5gs:2.7.1 command: ["open5gs-pcrfd"] environment: DB_URI: mongodb://mongo/open5gs restart: on-failure hss: - image: gradiant/open5gs:2.7.0 + image: gradiant/open5gs:2.7.1 command: open5gs-hssd environment: DB_URI: mongodb://mongo/open5gs restart: on-failure nrf: - image: gradiant/open5gs:2.7.0 + image: gradiant/open5gs:2.7.1 command: open5gs-nrfd restart : on-failure diff --git a/docs/open5gs-and-srsran-4g/README.md b/docs/open5gs-and-srsran-4g/README.md index c536030..5e090cf 100644 --- a/docs/open5gs-and-srsran-4g/README.md +++ b/docs/open5gs-and-srsran-4g/README.md @@ -7,7 +7,7 @@ deploy the EPC core (open5gs) with: ``` - docker compose -f epc.yaml up -d +docker compose -f epc.yaml up -d ``` Register subscriber in ngc with `./register_subscriber.sh`. diff --git a/docs/open5gs-and-srsran-4g/epc.yaml b/docs/open5gs-and-srsran-4g/epc.yaml index 22d1f24..2d32fc6 100644 --- a/docs/open5gs-and-srsran-4g/epc.yaml +++ b/docs/open5gs-and-srsran-4g/epc.yaml @@ -5,7 +5,7 @@ services: environment: MONGO_INITDB_DATABASE: open5gs webui: - image: gradiant/open5gs-webui:2.7.0 + image: gradiant/open5gs-webui:2.7.1 restart: on-failure environment: DB_URI: mongodb://mongo/open5gs @@ -13,25 +13,25 @@ services: ports: - 9999:9999 smf: - image: gradiant/open5gs:2.7.0 + image: gradiant/open5gs:2.7.1 command: open5gs-smfd restart : on-failure mme: - image: gradiant/open5gs:2.7.0 + image: gradiant/open5gs:2.7.1 command: open5gs-mmed restart: on-failure ports: - 36412:36412 sgwc: - image: gradiant/open5gs:2.7.0 + image: gradiant/open5gs:2.7.1 command: open5gs-sgwcd restart : on-failure sgwu: - image: gradiant/open5gs:2.7.0 + image: gradiant/open5gs:2.7.1 command: open5gs-sgwud restart : on-failure upf: - image: gradiant/open5gs:2.7.0 + image: gradiant/open5gs:2.7.1 command: ["open5gs-upfd"] cap_add: - all @@ -40,19 +40,19 @@ services: ports: - 2152:2152 pcrf: - image: gradiant/open5gs:2.7.0 + image: gradiant/open5gs:2.7.1 command: ["open5gs-pcrfd"] environment: DB_URI: mongodb://mongo/open5gs restart: on-failure hss: - image: gradiant/open5gs:2.7.0 + image: gradiant/open5gs:2.7.1 command: open5gs-hssd environment: DB_URI: mongodb://mongo/open5gs restart: on-failure nrf: - image: gradiant/open5gs:2.7.0 + image: gradiant/open5gs:2.7.1 command: open5gs-nrfd restart : on-failure diff --git a/docs/open5gs-and-srsran-4g/register_subscriber.sh b/docs/open5gs-and-srsran-4g/register_subscriber.sh index 48ad207..10f2ef4 100755 --- a/docs/open5gs-and-srsran-4g/register_subscriber.sh +++ b/docs/open5gs-and-srsran-4g/register_subscriber.sh @@ -1,6 +1,6 @@ #!/bin/bash -MONGO_CONTAINER=open5gs-and-srslte-mongo-1 +MONGO_CONTAINER=open5gs-and-srsran-4g-mongo-1 : 'open5gs-dbctl: Open5GS Database Configuration Tool (0.10.3) FLAGS: --db_uri=mongodb://localhost @@ -31,6 +31,6 @@ MONGO_CONTAINER=open5gs-and-srslte-mongo-1 docker cp open5gs-dbctl $MONGO_CONTAINER:/ docker run -ti --rm \ - --net open5gs-and-srslte_default \ + --net open5gs-and-srsran-4g_default \ -e DB_URI=mongodb://$MONGO_CONTAINER/open5gs \ gradiant/open5gs-dbctl:0.10.3 "open5gs-dbctl add 999700000000001 465B5CE8B199B49FAA5F0A2EE238A6BC E8ED289DEBA952E4283B54E88E6183CA" diff --git a/docs/open5gs-and-srsran-5g/core.yaml b/docs/open5gs-and-srsran-5g/core.yaml index ee6cdc7..454a7d6 100644 --- a/docs/open5gs-and-srsran-5g/core.yaml +++ b/docs/open5gs-and-srsran-5g/core.yaml @@ -5,34 +5,34 @@ services: environment: MONGO_INITDB_DATABASE: open5gs amf: - image: gradiant/open5gs:2.7.0 + image: gradiant/open5gs:2.7.1 command: - open5gs-amfd restart : on-failure ausf: - image: gradiant/open5gs:2.7.0 + image: gradiant/open5gs:2.7.1 command: - open5gs-ausfd restart : on-failure bsf: - image: gradiant/open5gs:2.7.0 + image: gradiant/open5gs:2.7.1 command: open5gs-bsfd restart : on-failure nrf: - image: gradiant/open5gs:2.7.0 + image: gradiant/open5gs:2.7.1 command: open5gs-nrfd restart : on-failure nssf: - image: gradiant/open5gs:2.7.0 + image: gradiant/open5gs:2.7.1 command: open5gs-nssfd restart : on-failure pcf: - image: gradiant/open5gs:2.7.0 + image: gradiant/open5gs:2.7.1 command: - open5gs-pcfd environment: @@ -40,30 +40,30 @@ services: restart : on-failure pcrf: - image: gradiant/open5gs:2.7.0 + image: gradiant/open5gs:2.7.1 command: ["open5gs-pcrfd"] environment: DB_URI: mongodb://mongo/open5gs restart: on-failure scp: - image: gradiant/open5gs:2.7.0 + image: gradiant/open5gs:2.7.1 command: open5gs-scpd environment: DB_URI: mongodb://mongo/open5gs restart: on-failure smf: - image: gradiant/open5gs:2.7.0 + image: gradiant/open5gs:2.7.1 command: open5gs-smfd restart : on-failure udm: - image: gradiant/open5gs:2.7.0 + image: gradiant/open5gs:2.7.1 restart: on-failure command: - open5gs-udmd udr: - image: gradiant/open5gs:2.7.0 + image: gradiant/open5gs:2.7.1 restart: on-failure environment: DB_URI: mongodb://mongo/open5gs @@ -71,7 +71,7 @@ services: - open5gs-udrd upf: - image: gradiant/open5gs:2.7.0 + image: gradiant/open5gs:2.7.1 command: - open5gs-upfd cap_add: @@ -82,7 +82,7 @@ services: - 2152:2152 webui: - image: gradiant/open5gs-webui:2.7.0 + image: gradiant/open5gs-webui:2.7.1 restart: on-failure environment: DB_URI: mongodb://mongo/open5gs diff --git a/docs/open5gs-and-ueransim/README.md b/docs/open5gs-and-ueransim/README.md index 276937b..df0eb5e 100644 --- a/docs/open5gs-and-ueransim/README.md +++ b/docs/open5gs-and-ueransim/README.md @@ -13,7 +13,7 @@ deploy the ngc core (open5gs) with: docker compose -f ngc.yaml up -d ``` -Register subscribers in ngc with `/register_subscriber.sh`. +Register subscribers in ngc with `./register_subscriber.sh`. # Deploy gnodeb @@ -58,4 +58,5 @@ Undeploy with: docker compose -f gnb1.yaml down docker compose -f gnb2.yaml down docker compose -f ngc.yaml down -v + ``` \ No newline at end of file diff --git a/docs/open5gs-and-ueransim/config/smf.yaml b/docs/open5gs-and-ueransim/config/smf.yaml new file mode 100644 index 0000000..b5746c3 --- /dev/null +++ b/docs/open5gs-and-ueransim/config/smf.yaml @@ -0,0 +1,356 @@ +logger: + file: /opt/open5gs/var/log/open5gs/smf.log +# level: info # fatal|error|warn|info(default)|debug|trace + +global: +# max: +# ue: 1024 # The number of UE can be increased depending on memory size. +# peer: 64 + +smf: + sbi: + server: + - dev: eth0 + port: 7777 + client: + # nrf: + # - uri: http://127.0.0.10:7777 + scp: + - uri: http://scp:7777 + pfcp: + server: + - dev: eth0 + client: + upf: + - address: upf + gtpc: + server: + - dev: eth0 + gtpu: + server: + - dev: eth0 + metrics: + server: + - dev: eth0 + port: 9090 + session: + - subnet: 10.45.0.1/16 + - subnet: 2001:db8:cafe::1/48 + dns: + - 8.8.8.8 + - 8.8.4.4 + - 2001:4860:4860::8888 + - 2001:4860:4860::8844 + mtu: 1400 + # p-cscf: + # - 127.0.0.1 + # - ::1 + ctf: + enabled: no # auto(default)|yes|no + # This line is commented so it doesn't try to reach to the pcrf + # freeDiameter: /opt/open5gs/etc/freeDiameter/smf.conf +################################################################################ +# SMF Info +################################################################################ +# +# 1. SMF sends SmfInfo(S-NSSAI, DNN, TAI) to the NRF +# 2. NRF responds to AMF with SmfInfo during NF-Discovery. +# 3. AMF selects SMF based on S-NSSAI, DNN and TAI in SmfInfo. +# +# Note that if there is no SmfInfo, any AMF can select this SMF. +# +# o S-NSSAI[SST:1] and DNN[internet] - At least 1 DNN is required in S-NSSAI +# info: +# - s_nssai: +# - sst: 1 +# dnn: +# - internet +# +# o S-NSSAI[SST:1 SD:009000] and DNN[internet or ims] +# info: +# - s_nssai: +# - sst: 1 +# sd: 009000 +# dnn: +# - internet +# - ims +# +# o S-NSSAI[SST:1] and DNN[internet] and TAI[PLMN-ID:99970 TAC:1] +# info: +# - s_nssai: +# - sst: 1 +# dnn: +# - internet +# tai: +# - plmn_id: +# mcc: 999 +# mnc: 70 +# tac: 1 +# +# o If any of conditions below are met: +# - S-NSSAI[SST:1] and DNN[internet] and TAI[PLMN-ID:99970 TAC:1-9] +# - S-NSSAI[SST:2 SD:000080] and DNN[internet or ims] +# - S-NSSAI[SST:4] and DNN[internet] and TAI[PLMN-ID:99970 TAC:10-20,30-40] +# info: +# - s_nssai: +# - sst: 1 +# dnn: +# - internet +# tai: +# - plmn_id: +# mcc: 999 +# mnc: 70 +# tac: +# - 1-9 +# - s_nssai: +# - sst: 2 +# sd: 000080 +# dnn: +# - internet +# - ims +# - s_nssai: +# - sst: 4 +# dnn: +# - internet +# tai: +# - plmn_id: +# mcc: 999 +# mnc: 70 +# tac: +# - 10-20 +# - 30-40 +# +# o Complex Example +# info: +# - s_nssai: +# - sst: 1 +# dnn: +# - internet +# - sst: 1 +# sd: 000080 +# dnn: +# - internet +# - ims +# - sst: 1 +# sd: 009000 +# dnn: +# [internet, ims] +# - sst: 2 +# dnn: +# - internet +# - sst: 3 +# sd: 123456 +# dnn: +# - internet +# tai: +# - plmn_id: +# mcc: 999 +# mnc: 70 +# tac: [1, 2, 3] +# - plmn_id: +# mcc: 999 +# mnc: 70 +# tac: 4 +# - plmn_id: +# mcc: 999 +# mnc: 70 +# tac: +# - 5 +# - 6 +# - plmn_id: +# mcc: 999 +# mnc: 70 +# tac: +# - 100-200 +# - 300-400 +# - plmn_id: +# mcc: 999 +# mnc: 70 +# tac: +# - 500-600 +# - 700-800 +# - 900-1000 +# - s_nssai: +# - sst: 4 +# dnn: +# - internet +# tai: +# - plmn_id: +# mcc: 999 +# mnc: 70 +# tac: 99 +# +################################################################################ +# SBI Server +################################################################################ +# o Override SBI address to be advertised to NRF +# sbi: +# server: +# - dev: eth0 +# advertise: open5gs-smf.svc.local +# +# sbi: +# server: +# - address: localhost +# advertise: +# - 127.0.0.99 +# - ::1 +# +################################################################################ +# SBI Client +################################################################################ +# o Direct communication with NRF interaction +# sbi: +# client: +# nrf: +# - uri: http://127.0.0.10:7777 +# +# o Indirect communication with delegated discovery +# sbi: +# client: +# scp: +# - uri: http://127.0.0.200:7777 +# +# o Indirect communication without delegated discovery +# sbi: +# client: +# nrf: +# - uri: http://127.0.0.10:7777 +# scp: +# - uri: http://127.0.0.200:7777 +# discovery: +# delegated: no +# +################################################################################ +# HTTPS scheme with TLS +################################################################################ +# o Set as default if not individually set +# default: +# tls: +# server: +# scheme: https +# private_key: @sysconfdir@/open5gs/tls/smf.key +# cert: @sysconfdir@/open5gs/tls/smf.crt +# client: +# scheme: https +# cacert: @sysconfdir@/open5gs/tls/ca.crt +# sbi: +# server: +# - address: smf.localdomain +# client: +# nrf: +# - uri: https://nrf.localdomain +# +# o Add client TLS verification +# default: +# tls: +# server: +# scheme: https +# private_key: @sysconfdir@/open5gs/tls/smf.key +# cert: @sysconfdir@/open5gs/tls/smf.crt +# verify_client: true +# verify_client_cacert: @sysconfdir@/open5gs/tls/ca.crt +# client: +# scheme: https +# cacert: @sysconfdir@/open5gs/tls/ca.crt +# client_private_key: @sysconfdir@/open5gs/tls/smf.key +# client_cert: @sysconfdir@/open5gs/tls/smf.crt +# sbi: +# server: +# - address: smf.localdomain +# client: +# nrf: +# - uri: https://nrf.localdomain +# +################################################################################ +# PFCP Server +################################################################################ +# o Override PFCP address to be advertised to UPF in PFCP association +# pfcp: +# server: +# - dev: eth0 +# advertise: open5gs-smf.svc.local +# +################################################################################ +# PFCP Client +################################################################################ +# o UPF selection by eNodeB TAC +# (either single TAC or multiple TACs, DECIMAL representation) +# pfcp: +# client: +# upf: +# - address: 127.0.0.7 +# tac: 1 +# - address: 127.0.0.12 +# tac: [3,5,8] +# +# o UPF selection by UE's DNN/APN (either single DNN/APN or multiple DNNs/APNs) +# pfcp: +# client: +# upf: +# - address: 127.0.0.7 +# dnn: ims +# - address: 127.0.0.12 +# dnn: [internet, web] +# +# o UPF selection by CellID(e_cell_id: 28bit, nr_cell_id: 36bit) +# (either single enb_id or multiple enb_ids, HEX representation) +# pfcp: +# client: +# upf: +# - address: 127.0.0.7 +# e_cell_id: 463 +# - address: 127.0.0.12 +# nr_cell_id: [123456789, 9413] +# +################################################################################ +# GTP-C Server +################################################################################ +# o Listen on IPv4 and IPv6 +# gtpc: +# server: +# - address: 127.0.0.4 +# - address: fd69:f21d:873c:fa::3 +# +################################################################################ +# GTP-U Server +################################################################################ +# o Listen on IPv4 and IPv6 +# gtpu: +# server: +# - address: 127.0.0.4 +# - address: ::1 +# +################################################################################ +# 3GPP Specification +################################################################################ +# o Specific DNN/APN(e.g 'ims') uses 10.46.0.1/16, 2001:db8:babe::1/48 +# (If the UE has unknown DNN/APN(not internet/ims), SMF/UPF will crash.) +# session: +# - subnet: 10.45.0.1/16 +# dnn: internet +# - subnet: 2001:db8:cafe::1/48 +# dnn: internet +# - subnet: 10.46.0.1/16 +# dnn: ims +# - subnet: 2001:db8:babe::1/48 +# dnn: ims +# +# o Pool Range +# session: +# - subnet: 10.45.0.1/16 +# range: +# - 10.45.0.100-10.45.0.200 +# - 10.45.1.100- +# - -10.45.0.200 +# - subnet: 2001:db8:cafe::1/48 +# range: +# - 2001:db8:cafe:a0::0-2001:db8:cafe:b0::0 +# - 2001:db8:cafe:c0::0-2001:db8:cafe:d0::0 +# +# o Security Indication(5G Core only) +# security_indication: +# integrity_protection_indication: required|preferred|not-needed +# confidentiality_protection_indication: required|preferred|not-needed +# maximum_integrity_protected_data_rate_uplink: bitrate64kbs|maximum-UE-rate +# maximum_integrity_protected_data_rate_downlink: bitrate64kbs|maximum-UE-rate diff --git a/docs/open5gs-and-ueransim/ngc.yaml b/docs/open5gs-and-ueransim/ngc.yaml index 6aa1290..ff2963f 100644 --- a/docs/open5gs-and-ueransim/ngc.yaml +++ b/docs/open5gs-and-ueransim/ngc.yaml @@ -7,36 +7,36 @@ services: MONGO_INITDB_DATABASE: open5gs amf: - image: gradiant/open5gs:2.7.0 + image: gradiant/open5gs:2.7.1 command: - open5gs-amfd restart: on-failure ausf: - image: gradiant/open5gs:2.7.0 + image: gradiant/open5gs:2.7.1 command: - open5gs-ausfd restart: on-failure bsf: - image: gradiant/open5gs:2.7.0 + image: gradiant/open5gs:2.7.1 command: - open5gs-bsfd restart: on-failure nrf: - image: gradiant/open5gs:2.7.0 + image: gradiant/open5gs:2.7.1 command: open5gs-nrfd restart: on-failure nssf: - image: gradiant/open5gs:2.7.0 + image: gradiant/open5gs:2.7.1 command: open5gs-nssfd restart: on-failure pcf: - image: gradiant/open5gs:2.7.0 + image: gradiant/open5gs:2.7.1 command: - open5gs-pcfd environment: @@ -44,25 +44,28 @@ services: restart: on-failure scp: - image: gradiant/open5gs:2.7.0 + image: gradiant/open5gs:2.7.1 command: open5gs-scpd environment: DB_URI: mongodb://mongo/open5gs restart: on-failure smf: - image: gradiant/open5gs:2.7.0 + image: gradiant/open5gs:2.7.1 + #It is necessary to mount the configuration file if pcfr is not deployed + volumes: + - ./config/smf.yaml:/opt/open5gs/etc/open5gs/smf.yaml restart: on-failure command: open5gs-smfd udm: - image: gradiant/open5gs:2.7.0 + image: gradiant/open5gs:2.7.1 restart: on-failure command: - open5gs-udmd udr: - image: gradiant/open5gs:2.7.0 + image: gradiant/open5gs:2.7.1 restart: on-failure environment: DB_URI: mongodb://mongo/open5gs @@ -70,7 +73,7 @@ services: - open5gs-udrd upf: - image: gradiant/open5gs:2.7.0 + image: gradiant/open5gs:2.7.1 command: - open5gs-upfd cap_add: @@ -83,7 +86,7 @@ services: - 2152:2152 webui: - image: gradiant/open5gs-webui:2.7.0 + image: gradiant/open5gs-webui:2.7.1 restart: on-failure environment: DB_URI: mongodb://mongo/open5gs diff --git a/images/open5gs/configs/open5gs/amf.yaml b/images/open5gs/configs/open5gs/amf.yaml index 0ef1d8e..bd7381d 100644 --- a/images/open5gs/configs/open5gs/amf.yaml +++ b/images/open5gs/configs/open5gs/amf.yaml @@ -1,5 +1,6 @@ logger: - file: /opt/open5gs/var/log/open5gs/amf.log + path: + file: /opt/open5gs/var/log/open5gs/amf.log # level: info # fatal|error|warn|info(default)|debug|trace global: diff --git a/images/open5gs/configs/open5gs/ausf.yaml b/images/open5gs/configs/open5gs/ausf.yaml index fac0d08..29476bd 100644 --- a/images/open5gs/configs/open5gs/ausf.yaml +++ b/images/open5gs/configs/open5gs/ausf.yaml @@ -1,5 +1,6 @@ logger: - file: /opt/open5gs/var/log/open5gs/ausf.log + path: + file: /opt/open5gs/var/log/open5gs/ausf.log # level: info # fatal|error|warn|info(default)|debug|trace global: diff --git a/images/open5gs/configs/open5gs/bsf.yaml b/images/open5gs/configs/open5gs/bsf.yaml index fd98944..2b35619 100644 --- a/images/open5gs/configs/open5gs/bsf.yaml +++ b/images/open5gs/configs/open5gs/bsf.yaml @@ -1,5 +1,6 @@ logger: - file: /opt/open5gs/var/log/open5gs/bsf.log + path: + file: /opt/open5gs/var/log/open5gs/bsf.log # level: info # fatal|error|warn|info(default)|debug|trace global: diff --git a/images/open5gs/configs/open5gs/hss.yaml b/images/open5gs/configs/open5gs/hss.yaml index 28ca8ec..4222417 100644 --- a/images/open5gs/configs/open5gs/hss.yaml +++ b/images/open5gs/configs/open5gs/hss.yaml @@ -1,6 +1,7 @@ db_uri: mongodb://localhost/open5gs logger: - file: /opt/open5gs/var/log/open5gs/hss.log + path: + file: /opt/open5gs/var/log/open5gs/hss.log # level: info # fatal|error|warn|info(default)|debug|trace global: diff --git a/images/open5gs/configs/open5gs/mme.yaml b/images/open5gs/configs/open5gs/mme.yaml index 8fa9c2d..2eaf43f 100644 --- a/images/open5gs/configs/open5gs/mme.yaml +++ b/images/open5gs/configs/open5gs/mme.yaml @@ -1,5 +1,6 @@ logger: - file: /opt/open5gs/var/log/open5gs/mme.log + path: + file: /opt/open5gs/var/log/open5gs/mme.log # level: info # fatal|error|warn|info(default)|debug|trace global: diff --git a/images/open5gs/configs/open5gs/nrf.yaml b/images/open5gs/configs/open5gs/nrf.yaml index 0fb4cb4..467f78e 100644 --- a/images/open5gs/configs/open5gs/nrf.yaml +++ b/images/open5gs/configs/open5gs/nrf.yaml @@ -1,5 +1,6 @@ logger: - file: /opt/open5gs/var/log/open5gs/nrf.log + path: + file: /opt/open5gs/var/log/open5gs/nrf.log # level: info # fatal|error|warn|info(default)|debug|trace global: diff --git a/images/open5gs/configs/open5gs/nssf.yaml b/images/open5gs/configs/open5gs/nssf.yaml index 69a5e89..b4a6b54 100644 --- a/images/open5gs/configs/open5gs/nssf.yaml +++ b/images/open5gs/configs/open5gs/nssf.yaml @@ -1,5 +1,6 @@ logger: - file: /opt/open5gs/var/log/open5gs/nssf.log + path: + file: /opt/open5gs/var/log/open5gs/nssf.log # level: info # fatal|error|warn|info(default)|debug|trace global: diff --git a/images/open5gs/configs/open5gs/pcf.yaml b/images/open5gs/configs/open5gs/pcf.yaml index 0319f12..dc7ec92 100644 --- a/images/open5gs/configs/open5gs/pcf.yaml +++ b/images/open5gs/configs/open5gs/pcf.yaml @@ -1,6 +1,7 @@ db_uri: mongodb://localhost/open5gs logger: - file: /opt/open5gs/var/log/open5gs/pcf.log + path: + file: /opt/open5gs/var/log/open5gs/pcf.log # level: info # fatal|error|warn|info(default)|debug|trace global: diff --git a/images/open5gs/configs/open5gs/pcrf.yaml b/images/open5gs/configs/open5gs/pcrf.yaml index c108d28..2183926 100644 --- a/images/open5gs/configs/open5gs/pcrf.yaml +++ b/images/open5gs/configs/open5gs/pcrf.yaml @@ -1,6 +1,7 @@ db_uri: mongodb://localhost/open5gs logger: - file: /opt/open5gs/var/log/open5gs/pcrf.log + path: + file: /opt/open5gs/var/log/open5gs/pcrf.log # level: info # fatal|error|warn|info(default)|debug|trace global: diff --git a/images/open5gs/configs/open5gs/scp.yaml b/images/open5gs/configs/open5gs/scp.yaml index ef0e14a..abf2fc3 100644 --- a/images/open5gs/configs/open5gs/scp.yaml +++ b/images/open5gs/configs/open5gs/scp.yaml @@ -1,5 +1,6 @@ logger: - file: /opt/open5gs/var/log/open5gs/scp.log + path: + file: /opt/open5gs/var/log/open5gs/scp.log # level: info # fatal|error|warn|info(default)|debug|trace global: diff --git a/images/open5gs/configs/open5gs/sgwc.yaml b/images/open5gs/configs/open5gs/sgwc.yaml index 240449e..b537f82 100644 --- a/images/open5gs/configs/open5gs/sgwc.yaml +++ b/images/open5gs/configs/open5gs/sgwc.yaml @@ -1,5 +1,6 @@ logger: - file: /opt/open5gs/var/log/open5gs/sgwc.log + path: + file: /opt/open5gs/var/log/open5gs/sgwc.log # level: info # fatal|error|warn|info(default)|debug|trace global: diff --git a/images/open5gs/configs/open5gs/sgwu.yaml b/images/open5gs/configs/open5gs/sgwu.yaml index b4a2db5..ad4943b 100644 --- a/images/open5gs/configs/open5gs/sgwu.yaml +++ b/images/open5gs/configs/open5gs/sgwu.yaml @@ -1,5 +1,6 @@ logger: - file: /opt/open5gs/var/log/open5gs/sgwu.log + path: + file: /opt/open5gs/var/log/open5gs/sgwu.log # level: info # fatal|error|warn|info(default)|debug|trace global: diff --git a/images/open5gs/configs/open5gs/smf.yaml b/images/open5gs/configs/open5gs/smf.yaml index bc7d3cd..7536d16 100644 --- a/images/open5gs/configs/open5gs/smf.yaml +++ b/images/open5gs/configs/open5gs/smf.yaml @@ -1,5 +1,6 @@ logger: - file: /opt/open5gs/var/log/open5gs/smf.log + path: + file: /opt/open5gs/var/log/open5gs/smf.log # level: info # fatal|error|warn|info(default)|debug|trace global: diff --git a/images/open5gs/configs/open5gs/udm.yaml b/images/open5gs/configs/open5gs/udm.yaml index 5a1ce75..171aa6a 100644 --- a/images/open5gs/configs/open5gs/udm.yaml +++ b/images/open5gs/configs/open5gs/udm.yaml @@ -1,5 +1,6 @@ logger: - file: /opt/open5gs/var/log/open5gs/udm.log + path: + file: /opt/open5gs/var/log/open5gs/udm.log # level: info # fatal|error|warn|info(default)|debug|trace global: diff --git a/images/open5gs/configs/open5gs/udr.yaml b/images/open5gs/configs/open5gs/udr.yaml index 4b09bf9..6a8a92d 100644 --- a/images/open5gs/configs/open5gs/udr.yaml +++ b/images/open5gs/configs/open5gs/udr.yaml @@ -1,6 +1,7 @@ db_uri: mongodb://localhost/open5gs logger: - file: /opt/open5gs/var/log/open5gs/udr.log + path: + file: /opt/open5gs/var/log/open5gs/udr.log # level: info # fatal|error|warn|info(default)|debug|trace global: diff --git a/images/open5gs/configs/open5gs/upf.yaml b/images/open5gs/configs/open5gs/upf.yaml index 4e70ccc..6ea3d80 100644 --- a/images/open5gs/configs/open5gs/upf.yaml +++ b/images/open5gs/configs/open5gs/upf.yaml @@ -1,5 +1,6 @@ logger: - file: /opt/open5gs/var/log/open5gs/upf.log + path: + file: /opt/open5gs/var/log/open5gs/upf.log # level: info # fatal|error|warn|info(default)|debug|trace global: diff --git a/images/srsran-5g/Dockerfile b/images/srsran-5g/Dockerfile index 938c441..1b871c4 100644 --- a/images/srsran-5g/Dockerfile +++ b/images/srsran-5g/Dockerfile @@ -3,6 +3,8 @@ FROM ubuntu:20.04 as builder ARG version ENV VERSION=$version +RUN echo "Building srsRAN version $VERSION" + LABEL org.opencontainers.image.authors="Álvaro Vázquez " \ org.opencontainers.image.vendor="Gradiant" \ org.opencontainers.image.licenses="Apache-2.0" \ @@ -13,15 +15,15 @@ RUN apt-get update && \ git \ build-essential \ cmake \ - make \ - gcc \ - g++ \ - pkg-config \ - libfftw3-dev \ - libmbedtls-dev \ - libsctp-dev \ - libyaml-cpp-dev \ - libgtest-dev \ + make \ + gcc \ + g++ \ + pkg-config \ + libfftw3-dev \ + libmbedtls-dev \ + libsctp-dev \ + libyaml-cpp-dev \ + libgtest-dev \ libzmq3-dev \ libboost-program-options-dev \ libconfig++-dev \ @@ -92,7 +94,6 @@ RUN apt-get update && \ apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get install --yes \ libuhd-dev \ - libuhd4.6.0 \ uhd-host && \ uhd_images_downloader && \ rm -rf /var/lib/apt/lists/*