diff --git a/.env b/.env index d904185..b411456 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ -OPEN5GS_VERSION=v2.6.1 -UBUNTU_VERSION=focal +OPEN5GS_VERSION=v2.6.2 +UBUNTU_VERSION=jammy MONGODB_VERSION=6.0 DOCKER_HOST_IP= diff --git a/README.md b/README.md index 0bfeda2..bb1d409 100644 --- a/README.md +++ b/README.md @@ -16,13 +16,13 @@ All the images depend on the base image. So first, update the `.env` file with t `OPEN5GS_VERSION` is the version of Open5GS to use. - Accepted values are the tags, branches or commit IDs used in the Open5GS project -- Default value: v2.6.1 -- Tested values: v2.5.5, v2.5.6, v2.5.8, v2.6.1 +- Default value: v2.6.2 +- Tested values: v2.5.5, v2.5.6, v2.5.8, v2.6.1, v2.6.2 `UBUNTU_VERSION` is the version of the ubuntu Docker image used as base for the containers. - Accepted values are the tags used by Ubuntu in Docker Hub -- Default value: focal -- Tested values: focal +- Default value: jammy +- Tested values: focal, jammy `MONGODB_VERSION` is the version of the mongo Docker image used as database for Open5GS. - Accepted values are the tags used by MongoDB in Docker Hub diff --git a/docs/compatibility.md b/docs/compatibility.md index 6dd707f..24d1eb1 100644 --- a/docs/compatibility.md +++ b/docs/compatibility.md @@ -10,9 +10,4 @@ In other obscure cases, you want to checkout to a commit where release has been Why would you want that? Because the docker-open5gs could have a release feature that you want to apply to an older Open5GS Release. -Sometimes it will work, sometimes it will not. It will be hard to test the interoperability between the releases published but here it is a compatibility table between versions: - -| docker-open5gs version | Open5GS version | backwards compatible | -| --- | --- | --- | -| v2.5.8 | v2.5.6 | yes | -| v2.6.1 | v2.5.8 | no | +Sometimes it will work, sometimes it will not. diff --git a/images/amf/Dockerfile b/images/amf/Dockerfile index d5962ca..3c9a18f 100644 --- a/images/amf/Dockerfile +++ b/images/amf/Dockerfile @@ -1,8 +1,8 @@ # syntax=docker/dockerfile:1 # global build-time arguments for FROM statements -ARG OPEN5GS_VERSION="v2.6.1" -ARG UBUNTU_VERSION="focal" +ARG OPEN5GS_VERSION="v2.6.2" +ARG UBUNTU_VERSION="jammy" FROM base:${OPEN5GS_VERSION} AS builder @@ -30,7 +30,7 @@ COPY --from=builder /open5gs/install/lib/x86_64-linux-gnu/libogscrypt.so.2 /open /open5gs/install/lib/x86_64-linux-gnu/libogssbi-openapi.so.2 /open5gs/install/lib/x86_64-linux-gnu/libogsmetrics.so.2 \ /open5gs/install/lib/x86_64-linux-gnu/libogssctp.so.2 /open5gs/install/lib/x86_64-linux-gnu/libogsngap.so.2 /open5gs/install/lib/x86_64-linux-gnu/libogsasn1c-ngap.so.2 \ /open5gs/install/lib/x86_64-linux-gnu/libogsasn1c-common.so.2 /open5gs/install/lib/x86_64-linux-gnu/libogsasn1c-util.so.2 \ -/open5gs/install/lib/x86_64-linux-gnu/libogsnas-5gs.so.2 /open5gs/install/lib/x86_64-linux-gnu/libogsnas-common.so.2 /open5gs/install/lib/x86_64-linux-gnu/libcm_prom.so \ +/open5gs/install/lib/x86_64-linux-gnu/libogsnas-5gs.so.2 /open5gs/install/lib/x86_64-linux-gnu/libogsnas-common.so.2 /open5gs/install/lib/x86_64-linux-gnu/libprom.so \ /open5gs/install/lib/x86_64-linux-gnu/ # copy entrypoint script diff --git a/images/ausf/Dockerfile b/images/ausf/Dockerfile index 9a0afde..125c335 100644 --- a/images/ausf/Dockerfile +++ b/images/ausf/Dockerfile @@ -1,8 +1,8 @@ # syntax=docker/dockerfile:1 # global build-time arguments for FROM statements -ARG OPEN5GS_VERSION="v2.6.1" -ARG UBUNTU_VERSION="focal" +ARG OPEN5GS_VERSION="v2.6.2" +ARG UBUNTU_VERSION="jammy" FROM base:${OPEN5GS_VERSION} AS builder diff --git a/images/base/Dockerfile b/images/base/Dockerfile index 8e94ae6..e115b7b 100644 --- a/images/base/Dockerfile +++ b/images/base/Dockerfile @@ -3,12 +3,12 @@ # global build-time arguments for FROM statements # (https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact) -ARG UBUNTU_VERSION="focal" +ARG UBUNTU_VERSION="jammy" FROM ubuntu:${UBUNTU_VERSION} AS builder # build-time arguments for builder -ARG OPEN5GS_VERSION="v2.6.1" +ARG OPEN5GS_VERSION="v2.6.2" ARG DEBIAN_FRONTEND="noninteractive" # install dependencies diff --git a/images/bsf/Dockerfile b/images/bsf/Dockerfile index ef60417..26c047f 100644 --- a/images/bsf/Dockerfile +++ b/images/bsf/Dockerfile @@ -1,8 +1,8 @@ # syntax=docker/dockerfile:1 # global build-time arguments for FROM statements -ARG OPEN5GS_VERSION="v2.6.1" -ARG UBUNTU_VERSION="focal" +ARG OPEN5GS_VERSION="v2.6.2" +ARG UBUNTU_VERSION="jammy" FROM base:${OPEN5GS_VERSION} AS builder diff --git a/images/nrf/Dockerfile b/images/nrf/Dockerfile index 6be7e7f..eba78a2 100644 --- a/images/nrf/Dockerfile +++ b/images/nrf/Dockerfile @@ -1,8 +1,8 @@ # syntax=docker/dockerfile:1 # global build-time arguments for FROM statements -ARG OPEN5GS_VERSION="v2.6.1" -ARG UBUNTU_VERSION="focal" +ARG OPEN5GS_VERSION="v2.6.2" +ARG UBUNTU_VERSION="jammy" FROM base:${OPEN5GS_VERSION} AS builder diff --git a/images/nssf/Dockerfile b/images/nssf/Dockerfile index ceec778..92a6830 100644 --- a/images/nssf/Dockerfile +++ b/images/nssf/Dockerfile @@ -1,8 +1,8 @@ # syntax=docker/dockerfile:1 # global build-time arguments for FROM statements -ARG OPEN5GS_VERSION="v2.6.1" -ARG UBUNTU_VERSION="focal" +ARG OPEN5GS_VERSION="v2.6.2" +ARG UBUNTU_VERSION="jammy" FROM base:${OPEN5GS_VERSION} AS builder diff --git a/images/pcf/Dockerfile b/images/pcf/Dockerfile index f8ad853..d506a01 100644 --- a/images/pcf/Dockerfile +++ b/images/pcf/Dockerfile @@ -1,8 +1,8 @@ # syntax=docker/dockerfile:1 # global build-time arguments for FROM statements -ARG OPEN5GS_VERSION="v2.6.1" -ARG UBUNTU_VERSION="focal" +ARG OPEN5GS_VERSION="v2.6.2" +ARG UBUNTU_VERSION="jammy" FROM base:${OPEN5GS_VERSION} AS builder @@ -27,7 +27,7 @@ COPY --from=builder /open5gs/install/etc/open5gs/pcf.yaml /open5gs/install/etc/o COPY --from=builder /open5gs/install/etc/open5gs/tls/ca.crt /open5gs/install/etc/open5gs/tls/pcf.crt /open5gs/install/etc/open5gs/tls/pcf.key /open5gs/install/etc/open5gs/tls/ COPY --from=builder /open5gs/install/lib/x86_64-linux-gnu/libogscrypt.so.2 /open5gs/install/lib/x86_64-linux-gnu/libogsproto.so.2 \ /open5gs/install/lib/x86_64-linux-gnu/libogscore.so.2 /open5gs/install/lib/x86_64-linux-gnu/libogssbi.so.2 /open5gs/install/lib/x86_64-linux-gnu/libogsapp.so.2 \ -/open5gs/install/lib/x86_64-linux-gnu/libogssbi-openapi.so.2 /open5gs/install/lib/x86_64-linux-gnu/libogsdbi.so.2 /open5gs/install/lib/x86_64-linux-gnu/libcm_prom.so \ +/open5gs/install/lib/x86_64-linux-gnu/libogssbi-openapi.so.2 /open5gs/install/lib/x86_64-linux-gnu/libogsdbi.so.2 /open5gs/install/lib/x86_64-linux-gnu/libprom.so \ /open5gs/install/lib/x86_64-linux-gnu/libogsmetrics.so.2 /open5gs/install/lib/x86_64-linux-gnu/ # create directory to store the logs diff --git a/images/scp/Dockerfile b/images/scp/Dockerfile index 925b94b..eb06b2c 100644 --- a/images/scp/Dockerfile +++ b/images/scp/Dockerfile @@ -1,8 +1,8 @@ # syntax=docker/dockerfile:1 # global build-time arguments for FROM statements -ARG OPEN5GS_VERSION="v2.6.1" -ARG UBUNTU_VERSION="focal" +ARG OPEN5GS_VERSION="v2.6.2" +ARG UBUNTU_VERSION="jammy" FROM base:${OPEN5GS_VERSION} AS builder diff --git a/images/smf/Dockerfile b/images/smf/Dockerfile index 2913a39..542ac84 100644 --- a/images/smf/Dockerfile +++ b/images/smf/Dockerfile @@ -1,8 +1,8 @@ # syntax=docker/dockerfile:1 # global build-time arguments for FROM statements -ARG OPEN5GS_VERSION="v2.6.1" -ARG UBUNTU_VERSION="focal" +ARG OPEN5GS_VERSION="v2.6.2" +ARG UBUNTU_VERSION="jammy" FROM base:${OPEN5GS_VERSION} AS builder @@ -35,7 +35,7 @@ COPY --from=builder /open5gs/install/lib/x86_64-linux-gnu/libogscrypt.so.2 /open /open5gs/install/lib/x86_64-linux-gnu/libogsdiameter-gx.so.2 /open5gs/install/lib/x86_64-linux-gnu/libogsdiameter-common.so.2 \ /open5gs/install/lib/x86_64-linux-gnu/libogsdiameter-gy.so.2 /open5gs/install/lib/x86_64-linux-gnu/libogsdiameter-s6b.so.2 /open5gs/install/lib/x86_64-linux-gnu/libogsdiameter-rx.so.2 \ /open5gs/install/lib/x86_64-linux-gnu/libogspfcp.so.2 /open5gs/install/lib/x86_64-linux-gnu/libogsgtp.so.2 /open5gs/install/lib/x86_64-linux-gnu/libogsipfw.so.2 \ -/open5gs/install/lib/x86_64-linux-gnu/libfdcore.so.7 /open5gs/install/lib/x86_64-linux-gnu/libfdproto.so.7 /open5gs/install/lib/x86_64-linux-gnu/libcm_prom.so \ +/open5gs/install/lib/x86_64-linux-gnu/libfdcore.so.7 /open5gs/install/lib/x86_64-linux-gnu/libfdproto.so.7 /open5gs/install/lib/x86_64-linux-gnu/libprom.so \ /open5gs/install/lib/x86_64-linux-gnu/ # create directory to store the logs diff --git a/images/udm/Dockerfile b/images/udm/Dockerfile index 674f888..8d5abd8 100644 --- a/images/udm/Dockerfile +++ b/images/udm/Dockerfile @@ -1,8 +1,8 @@ # syntax=docker/dockerfile:1 # global build-time arguments for FROM statements -ARG OPEN5GS_VERSION="v2.6.1" -ARG UBUNTU_VERSION="focal" +ARG OPEN5GS_VERSION="v2.6.2" +ARG UBUNTU_VERSION="jammy" FROM base:${OPEN5GS_VERSION} AS builder diff --git a/images/udr/Dockerfile b/images/udr/Dockerfile index 0e17209..83b9668 100644 --- a/images/udr/Dockerfile +++ b/images/udr/Dockerfile @@ -1,8 +1,8 @@ # syntax=docker/dockerfile:1 # global build-time arguments for FROM statements -ARG OPEN5GS_VERSION="v2.6.1" -ARG UBUNTU_VERSION="focal" +ARG OPEN5GS_VERSION="v2.6.2" +ARG UBUNTU_VERSION="jammy" FROM base:${OPEN5GS_VERSION} AS builder diff --git a/images/upf/Dockerfile b/images/upf/Dockerfile index a0cd15d..c77e900 100644 --- a/images/upf/Dockerfile +++ b/images/upf/Dockerfile @@ -1,8 +1,8 @@ # syntax=docker/dockerfile:1 # global build-time arguments for FROM statements -ARG OPEN5GS_VERSION="v2.6.1" -ARG UBUNTU_VERSION="focal" +ARG OPEN5GS_VERSION="v2.6.2" +ARG UBUNTU_VERSION="jammy" FROM base:${OPEN5GS_VERSION} AS builder @@ -31,7 +31,7 @@ COPY --from=builder /open5gs/install/etc/open5gs/upf.yaml /open5gs/install/etc/o COPY --from=builder /open5gs/install/lib/x86_64-linux-gnu/libogsproto.so.2 /open5gs/install/lib/x86_64-linux-gnu/libogscore.so.2 \ /open5gs/install/lib/x86_64-linux-gnu/libogsapp.so.2 /open5gs/install/lib/x86_64-linux-gnu/libogspfcp.so.2 /open5gs/install/lib/x86_64-linux-gnu/libogsgtp.so.2 \ /open5gs/install/lib/x86_64-linux-gnu/libogstun.so.2 /open5gs/install/lib/x86_64-linux-gnu/libogsipfw.so.2 /open5gs/install/lib/x86_64-linux-gnu/libogsmetrics.so.2 \ -/open5gs/install/lib/x86_64-linux-gnu/libcm_prom.so /open5gs/install/lib/x86_64-linux-gnu/ +/open5gs/install/lib/x86_64-linux-gnu/libprom.so /open5gs/install/lib/x86_64-linux-gnu/ # copy helper_functions and entrypoint scripts COPY ./helper_functions.sh /open5gs/helper_functions.sh