diff --git a/controllers/common.go b/controllers/common.go index 7a72205..bf5eebf 100644 --- a/controllers/common.go +++ b/controllers/common.go @@ -20,7 +20,7 @@ const ( ConfigMapVersionAnnotation = "workload.nephio.org/configMapVersion" // TODO(jbelamaric): Update to use ImageConfig spec.ImagePaths["upf"] - AMFImage = "docker.io/nephio/free5gc-amf:3.2.1" - SMFImage = "docker.io/nephio/free5gc-smf:3.2.1" - UPFImage = "docker.io/nephio/free5gc-upf:3.2.1" + AMFImage = "docker.io/nephio/free5gc-amf:3.3.0" + SMFImage = "docker.io/nephio/free5gc-smf:3.3.0" + UPFImage = "docker.io/nephio/free5gc-upf:3.3.0" ) diff --git a/free5gc-images/Makefile b/free5gc-images/Makefile index 1d93a85..d8899dc 100644 --- a/free5gc-images/Makefile +++ b/free5gc-images/Makefile @@ -1,4 +1,4 @@ -FREE5GC_VERSION ?= 3.2.1 +FREE5GC_VERSION ?= 3.3.0 IMG_REGISTRY ?= docker.io/nephio BASE_IMAGE ?= alpine:3.18.0 BUILDER_IMAGE ?= golang:1.20.5 diff --git a/free5gc-images/free5gc-amf/Dockerfile b/free5gc-images/free5gc-amf/Dockerfile index f1dc747..70b459c 100644 --- a/free5gc-images/free5gc-amf/Dockerfile +++ b/free5gc-images/free5gc-amf/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=3.2.1 +ARG VERSION=3.3.0 ARG REGISTRY=docker.io/nephio ARG BASE_IMAGE=alpine @@ -8,15 +8,15 @@ FROM $BASE_IMAGE ENV GIN_MODE="release" WORKDIR /free5gc -RUN mkdir --parents ./log/ ./config/ ./TLS/ ./amf/ +RUN mkdir --parents ./cert/ ./log/ ./config/ ./amf/ # Copy executable and default certs/configs COPY --from=builder /free5gc/amf ./amf -COPY --from=builder /free5gc/config/TLS/amf.pem ./config/TLS/ -COPY --from=builder /free5gc/config/TLS/amf.key ./config/TLS/ +COPY --from=builder /free5gc/cert/amf.pem ./cert/ +COPY --from=builder /free5gc/cert/amf.key ./cert/ COPY --from=builder /free5gc/config/amfcfg.yaml ./config/ VOLUME [ "/free5gc/config" ] -#VOLUME [ "/free5gc/config/TLS" ] + WORKDIR /free5gc/amf diff --git a/free5gc-images/free5gc-ausf/Dockerfile b/free5gc-images/free5gc-ausf/Dockerfile index b8bc3dd..0b8835e 100644 --- a/free5gc-images/free5gc-ausf/Dockerfile +++ b/free5gc-images/free5gc-ausf/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=3.2.1 +ARG VERSION=3.3.0 ARG REGISTRY=docker.io/nephio ARG BASE_IMAGE=alpine @@ -8,15 +8,15 @@ FROM $BASE_IMAGE ENV GIN_MODE="release" WORKDIR /free5gc -RUN mkdir --parents ./log/ ./config/TLS/ ./ausf/ +RUN mkdir --parents ./cert/ ./log/ ./cert/ ./ausf/ # Copy executable and default certs COPY --from=builder /free5gc/ausf ./ausf -COPY --from=builder /free5gc/config/TLS/ausf.pem ./config/TLS/ -COPY --from=builder /free5gc/config/TLS/ausf.key ./config/TLS/ +COPY --from=builder /free5gc/cert/ausf.pem ./cert/ +COPY --from=builder /free5gc/cert/ausf.key ./cert/ COPY --from=builder /free5gc/config/ausfcfg.yaml ./config/ VOLUME [ "/free5gc/config" ] -#VOLUME [ "/free5gc/config/TLS" ] + WORKDIR /free5gc/ausf diff --git a/free5gc-images/free5gc-base/Dockerfile b/free5gc-images/free5gc-base/Dockerfile index 3a97adb..206d32d 100644 --- a/free5gc-images/free5gc-base/Dockerfile +++ b/free5gc-images/free5gc-base/Dockerfile @@ -8,7 +8,7 @@ ARG BASE_IMAGE=alpine # FROM $BUILDER_IMAGE AS builder -ARG VERSION=3.2.1 +ARG VERSION=3.3.0 ENV VERSION=$VERSION # Note: "golang" builder image is based on Debian @@ -34,7 +34,7 @@ FROM $BASE_IMAGE WORKDIR /free5gc -RUN mkdir --parents ./config/ ./config/TLS/ ./public +RUN mkdir --parents ./cert/ ./config/ ./cert/ ./public # Copy executables COPY --from=builder /go/src/free5gc/bin/* ./ @@ -45,4 +45,4 @@ COPY --from=builder /go/src/free5gc/webconsole/public ./public # Copy certificates and config files COPY --from=builder /go/src/free5gc/config/* ./config/ -COPY --from=builder /go/src/free5gc/config/TLS/* ./config/TLS/ +COPY --from=builder /go/src/free5gc/cert/* ./cert/ diff --git a/free5gc-images/free5gc-n3iwf/Dockerfile b/free5gc-images/free5gc-n3iwf/Dockerfile index 8897d8c..0415b81 100644 --- a/free5gc-images/free5gc-n3iwf/Dockerfile +++ b/free5gc-images/free5gc-n3iwf/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=3.2.1 +ARG VERSION=3.3.0 ARG REGISTRY=docker.io/nephio ARG BASE_IMAGE=alpine @@ -11,15 +11,15 @@ ENV GIN_MODE="release" RUN apk add -U iproute2 WORKDIR /free5gc -RUN mkdir --parents ./log/ ./config/TLS/ ./n3iwf/ +RUN mkdir --parents ./cert/ ./log/ ./cert/ ./n3iwf/ # Copy executable and default certs/configs COPY --from=builder /free5gc/n3iwf ./n3iwf -COPY --from=builder /free5gc/config/TLS/n3iwf.pem ./config/TLS/ -COPY --from=builder /free5gc/config/TLS/n3iwf.key ./config/TLS/ +COPY --from=builder /free5gc/cert/n3iwf.pem ./cert/ +COPY --from=builder /free5gc/cert/n3iwf.key ./cert/ COPY --from=builder /free5gc/config/n3iwfcfg.yaml ./config/ VOLUME [ "/free5gc/config" ] -#VOLUME [ "/free5gc/config/TLS" ] + WORKDIR /free5gc/n3iwf diff --git a/free5gc-images/free5gc-nrf/Dockerfile b/free5gc-images/free5gc-nrf/Dockerfile index 96b4993..62d44dc 100644 --- a/free5gc-images/free5gc-nrf/Dockerfile +++ b/free5gc-images/free5gc-nrf/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=3.2.1 +ARG VERSION=3.3.0 ARG REGISTRY=docker.io/nephio ARG BASE_IMAGE=alpine @@ -8,15 +8,15 @@ FROM $BASE_IMAGE ENV GIN_MODE="release" WORKDIR /free5gc -RUN mkdir --parents ./log/ ./config/TLS/ ./nrf/ +RUN mkdir --parents ./cert/ ./log/ ./cert/ ./nrf/ # Copy executable and default certs COPY --from=builder /free5gc/nrf ./nrf -COPY --from=builder /free5gc/config/TLS/nrf.pem ./config/TLS/ -COPY --from=builder /free5gc/config/TLS/nrf.key ./config/TLS/ +COPY --from=builder /free5gc/cert/nrf.pem ./cert/ +COPY --from=builder /free5gc/cert/nrf.key ./cert/ COPY --from=builder /free5gc/config/nrfcfg.yaml ./config/ VOLUME [ "/free5gc/config" ] -#VOLUME [ "/free5gc/config/TLS" ] + WORKDIR /free5gc/nrf diff --git a/free5gc-images/free5gc-nssf/Dockerfile b/free5gc-images/free5gc-nssf/Dockerfile index 6123e4f..2f71e62 100644 --- a/free5gc-images/free5gc-nssf/Dockerfile +++ b/free5gc-images/free5gc-nssf/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=3.2.1 +ARG VERSION=3.3.0 ARG REGISTRY=docker.io/nephio ARG BASE_IMAGE=alpine @@ -8,15 +8,15 @@ FROM $BASE_IMAGE ENV GIN_MODE="release" WORKDIR /free5gc -RUN mkdir --parents ./log/ ./config/TLS/ ./nssf/ +RUN mkdir --parents ./cert/ ./log/ ./cert/ ./nssf/ # Copy executable and default certs COPY --from=builder /free5gc/nssf ./nssf -COPY --from=builder /free5gc/config/TLS/nssf.pem ./config/TLS/ -COPY --from=builder /free5gc/config/TLS/nssf.key ./config/TLS/ +COPY --from=builder /free5gc/cert/nssf.pem ./cert/ +COPY --from=builder /free5gc/cert/nssf.key ./cert/ COPY --from=builder /free5gc/config/nssfcfg.yaml ./config/ VOLUME [ "/free5gc/config" ] -#VOLUME [ "/free5gc/config/TLS" ] + WORKDIR /free5gc/nssf diff --git a/free5gc-images/free5gc-pcf/Dockerfile b/free5gc-images/free5gc-pcf/Dockerfile index 9e353cf..05db400 100644 --- a/free5gc-images/free5gc-pcf/Dockerfile +++ b/free5gc-images/free5gc-pcf/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=3.2.1 +ARG VERSION=3.3.0 ARG REGISTRY=docker.io/nephio ARG BASE_IMAGE=alpine @@ -8,15 +8,15 @@ FROM $BASE_IMAGE ENV GIN_MODE="release" WORKDIR /free5gc -RUN mkdir --parents ./config/ ./log/ ./config/TLS/ ./pcf/ +RUN mkdir --parents ./cert/ ./config/ ./log/ ./cert/ ./pcf/ # Copy executable and default certs COPY --from=builder /free5gc/pcf ./pcf -COPY --from=builder /free5gc/config/TLS/pcf.pem ./config/TLS/ -COPY --from=builder /free5gc/config/TLS/pcf.key ./config/TLS/ +COPY --from=builder /free5gc/cert/pcf.pem ./cert/ +COPY --from=builder /free5gc/cert/pcf.key ./cert/ COPY --from=builder /free5gc/config/pcfcfg.yaml ./config/ VOLUME [ "/free5gc/config" ] -#VOLUME [ "/free5gc/config/TLS" ] + WORKDIR /free5gc/pcf diff --git a/free5gc-images/free5gc-smf/Dockerfile b/free5gc-images/free5gc-smf/Dockerfile index 806eb9e..53db2bb 100644 --- a/free5gc-images/free5gc-smf/Dockerfile +++ b/free5gc-images/free5gc-smf/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=3.2.1 +ARG VERSION=3.3.0 ARG REGISTRY=docker.io/nephio ARG BASE_IMAGE=alpine @@ -8,16 +8,16 @@ FROM $BASE_IMAGE ENV GIN_MODE="release" WORKDIR /free5gc -RUN mkdir --parents ./log/ ./config/TLS/ ./smf/ +RUN mkdir --parents ./cert/ ./log/ ./cert/ ./smf/ # Copy executable and default certs COPY --from=builder /free5gc/smf ./smf -COPY --from=builder /free5gc/config/TLS/smf.pem ./config/TLS/ -COPY --from=builder /free5gc/config/TLS/smf.key ./config/TLS/ +COPY --from=builder /free5gc/cert/smf.pem ./cert/ +COPY --from=builder /free5gc/cert/smf.key ./cert/ COPY --from=builder /free5gc/config/smfcfg.yaml ./config/ COPY --from=builder /free5gc/config/uerouting.yaml ./config/ VOLUME [ "/free5gc/config" ] -#VOLUME [ "/free5gc/config/TLS" ] + WORKDIR /free5gc/smf diff --git a/free5gc-images/free5gc-udm/Dockerfile b/free5gc-images/free5gc-udm/Dockerfile index f8874d9..c30af69 100644 --- a/free5gc-images/free5gc-udm/Dockerfile +++ b/free5gc-images/free5gc-udm/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=3.2.1 +ARG VERSION=3.3.0 ARG REGISTRY=docker.io/nephio ARG BASE_IMAGE=alpine @@ -8,15 +8,15 @@ FROM $BASE_IMAGE ENV GIN_MODE="release" WORKDIR /free5gc -RUN mkdir --parents ./log/ ./config/TLS/ ./udm/ +RUN mkdir --parents ./cert/ ./log/ ./cert/ ./udm/ # Copy executable and default certs COPY --from=builder /free5gc/udm ./udm -COPY --from=builder /free5gc/config/TLS/udm.pem ./config/TLS/ -COPY --from=builder /free5gc/config/TLS/udm.key ./config/TLS/ +COPY --from=builder /free5gc/cert/udm.pem ./cert/ +COPY --from=builder /free5gc/cert/udm.key ./cert/ COPY --from=builder /free5gc/config/udmcfg.yaml ./config/ VOLUME [ "/free5gc/config" ] -#VOLUME [ "/free5gc/config/TLS" ] + WORKDIR /free5gc/udm diff --git a/free5gc-images/free5gc-udr/Dockerfile b/free5gc-images/free5gc-udr/Dockerfile index e3adddc..7072771 100644 --- a/free5gc-images/free5gc-udr/Dockerfile +++ b/free5gc-images/free5gc-udr/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=3.2.1 +ARG VERSION=3.3.0 ARG REGISTRY=docker.io/nephio ARG BASE_IMAGE=alpine @@ -8,15 +8,15 @@ FROM $BASE_IMAGE ENV GIN_MODE="release" WORKDIR /free5gc -RUN mkdir --parents ./config/ ./log/ ./config/TLS/ ./udr/ +RUN mkdir --parents ./cert/ ./config/ ./log/ ./cert/ ./udr/ # Copy executable and default certs COPY --from=builder /free5gc/udr ./udr -COPY --from=builder /free5gc/config/TLS/udr.pem ./config/TLS/ -COPY --from=builder /free5gc/config/TLS/udr.key ./config/TLS/ +COPY --from=builder /free5gc/cert/udr.pem ./cert/ +COPY --from=builder /free5gc/cert/udr.key ./cert/ COPY --from=builder /free5gc/config/udrcfg.yaml ./config/ VOLUME [ "/free5gc/config" ] -#VOLUME [ "/free5gc/config/TLS" ] + WORKDIR /free5gc/udr diff --git a/free5gc-images/free5gc-upf/Dockerfile b/free5gc-images/free5gc-upf/Dockerfile index fea67e0..62d47c4 100644 --- a/free5gc-images/free5gc-upf/Dockerfile +++ b/free5gc-images/free5gc-upf/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=3.2.1 +ARG VERSION=3.3.0 ARG REGISTRY=docker.io/nephio ARG BASE_IMAGE=alpine @@ -11,7 +11,7 @@ ENV GIN_MODE="release" RUN apk --no-cache add iproute2 iptables WORKDIR /free5gc -RUN mkdir --parents ./config/ ./upf/ +RUN mkdir --parents ./cert/ ./config/ ./upf/ # Copy executable and default configs/certs COPY --from=builder /free5gc/upf ./upf/ diff --git a/free5gc-images/free5gc-webconsole/Dockerfile b/free5gc-images/free5gc-webconsole/Dockerfile index 0a08c42..ddf7847 100644 --- a/free5gc-images/free5gc-webconsole/Dockerfile +++ b/free5gc-images/free5gc-webconsole/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=3.2.1 +ARG VERSION=3.3.0 ARG REGISTRY=docker.io/nephio ARG BASE_IMAGE=alpine @@ -10,7 +10,7 @@ ENV GIN_MODE="release" RUN apk --no-cache add libc6-compat WORKDIR /free5gc -RUN mkdir --parents ./config/ ./webconsole/public +RUN mkdir --parents ./cert/ ./config/ ./webconsole/public # Copy executable and default configs/statics COPY --from=builder /free5gc/webconsole ./webconsole/