diff --git a/docker/Dockerfile.build.fhi72.rhel9 b/docker/Dockerfile.build.fhi72.rhel9 index fc5570a85c..6a70b89a51 100644 --- a/docker/Dockerfile.build.fhi72.rhel9 +++ b/docker/Dockerfile.build.fhi72.rhel9 @@ -25,7 +25,7 @@ # #--------------------------------------------------------------------- -FROM ran-base:latest as ran-base +FROM ran-base:latest AS ran-base ENV TZ=Europe RUN rm -Rf /oai-ran @@ -48,7 +48,7 @@ RUN git clone https://gerrit.o-ran-sc.org/r/o-du/phy.git /opt/phy && \ cd /opt/phy/fhi_lib/lib && \ RTE_SDK=/oai-ran/dpdk-stable-20.11.9/ XRAN_DIR=/opt/phy/fhi_lib make XRAN_LIB_SO=1 -FROM ran-base as ran-build-fhi72 +FROM ran-base AS ran-build-fhi72 ARG E2AP_VERSION=E2AP_V3 ARG KPM_VERSION=KPM_V3_00 diff --git a/docker/Dockerfile.build.fhi72.ubuntu22 b/docker/Dockerfile.build.fhi72.ubuntu22 index 774f488ed7..16ce820832 100644 --- a/docker/Dockerfile.build.fhi72.ubuntu22 +++ b/docker/Dockerfile.build.fhi72.ubuntu22 @@ -25,7 +25,7 @@ # #--------------------------------------------------------------------- -FROM ran-base:latest as ran-base +FROM ran-base:latest AS ran-base ARG E2AP_VERSION=E2AP_V3 ARG KPM_VERSION=KPM_V3_00 @@ -61,7 +61,7 @@ RUN git clone https://gerrit.o-ran-sc.org/r/o-du/phy.git /opt/phy && \ cd /opt/phy/fhi_lib/lib && \ RTE_SDK=/oai-ran/dpdk-stable-20.11.9/ XRAN_DIR=/opt/phy/fhi_lib make XRAN_LIB_SO=1 -FROM ran-base as ran-build-fhi72 +FROM ran-base AS ran-build-fhi72 ## Build and install OAI #run build_oai to build the target image RUN /bin/sh oaienv && \ diff --git a/docker/Dockerfile.build.rhel9 b/docker/Dockerfile.build.rhel9 index 6adeb62b31..464c6caf5a 100644 --- a/docker/Dockerfile.build.rhel9 +++ b/docker/Dockerfile.build.rhel9 @@ -25,7 +25,7 @@ # #--------------------------------------------------------------------- -FROM ran-base:latest as ran-build +FROM ran-base:latest AS ran-build RUN rm -Rf /oai-ran WORKDIR /oai-ran diff --git a/docker/Dockerfile.build.rocky b/docker/Dockerfile.build.rocky index aef75c7d2b..3fe164b10d 100644 --- a/docker/Dockerfile.build.rocky +++ b/docker/Dockerfile.build.rocky @@ -25,7 +25,7 @@ # #--------------------------------------------------------------------- -FROM ran-base:latest as ran-build +FROM ran-base:latest AS ran-build RUN rm -Rf /oai-ran WORKDIR /oai-ran diff --git a/docker/Dockerfile.build.ubuntu22 b/docker/Dockerfile.build.ubuntu22 index 6a4b44c794..e4cc71fdcf 100644 --- a/docker/Dockerfile.build.ubuntu22 +++ b/docker/Dockerfile.build.ubuntu22 @@ -25,7 +25,7 @@ # #--------------------------------------------------------------------- -FROM ran-base:latest as ran-build +FROM ran-base:latest AS ran-build ARG BUILD_OPTION RUN rm -Rf /oai-ran diff --git a/docker/Dockerfile.build.ubuntu22.cross-arm64 b/docker/Dockerfile.build.ubuntu22.cross-arm64 index 371651e5ec..349a4f791c 100644 --- a/docker/Dockerfile.build.ubuntu22.cross-arm64 +++ b/docker/Dockerfile.build.ubuntu22.cross-arm64 @@ -25,7 +25,7 @@ # #--------------------------------------------------------------------- -FROM ran-base:latest as ran-build +FROM ran-base:latest AS ran-build RUN rm -Rf /oai-ran WORKDIR /oai-ran diff --git a/docker/Dockerfile.eNB.rhel9 b/docker/Dockerfile.eNB.rhel9 index c523ac0b1f..391f2a6594 100644 --- a/docker/Dockerfile.eNB.rhel9 +++ b/docker/Dockerfile.eNB.rhel9 @@ -31,7 +31,7 @@ FROM ran-build:latest AS enb-build #start from scratch for target executable -FROM registry.access.redhat.com/ubi9/ubi:latest as oai-enb +FROM registry.access.redhat.com/ubi9/ubi:latest AS oai-enb ENV TZ=Europe/Paris RUN dnf update -y && \ diff --git a/docker/Dockerfile.eNB.rocky b/docker/Dockerfile.eNB.rocky index 04243dfda2..eee61a7dda 100644 --- a/docker/Dockerfile.eNB.rocky +++ b/docker/Dockerfile.eNB.rocky @@ -32,7 +32,7 @@ FROM ran-build:latest AS enb-build #start from scratch for target executable -FROM $BASE_IMAGE as oai-enb +FROM $BASE_IMAGE AS oai-enb ENV TZ=Europe/Paris RUN dnf update -y && \ diff --git a/docker/Dockerfile.eNB.ubuntu22 b/docker/Dockerfile.eNB.ubuntu22 index af580f6258..44797cd7f5 100644 --- a/docker/Dockerfile.eNB.ubuntu22 +++ b/docker/Dockerfile.eNB.ubuntu22 @@ -25,13 +25,13 @@ # #--------------------------------------------------------------------- -FROM ran-base:latest as enb-base +FROM ran-base:latest AS enb-base FROM ran-build:latest AS enb-build #start from scratch for target executable -FROM ubuntu:jammy as oai-enb +FROM ubuntu:jammy AS oai-enb ARG BUILD_OPTION ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Europe/Paris diff --git a/docker/Dockerfile.gNB.aerial.ubuntu22 b/docker/Dockerfile.gNB.aerial.ubuntu22 index 3259e27baa..dcfe005caa 100644 --- a/docker/Dockerfile.gNB.aerial.ubuntu22 +++ b/docker/Dockerfile.gNB.aerial.ubuntu22 @@ -25,7 +25,7 @@ # #--------------------------------------------------------------------- -FROM ran-base:latest as ran-build +FROM ran-base:latest AS ran-build RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \ @@ -58,7 +58,7 @@ RUN /bin/sh oaienv && \ #start from scratch for target executable -FROM ubuntu:jammy as oai-gnb-aerial +FROM ubuntu:jammy AS oai-gnb-aerial ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Europe diff --git a/docker/Dockerfile.gNB.aerial.ubuntu22.sanitize-address b/docker/Dockerfile.gNB.aerial.ubuntu22.sanitize-address index 919d7b788d..62c7de33d6 100644 --- a/docker/Dockerfile.gNB.aerial.ubuntu22.sanitize-address +++ b/docker/Dockerfile.gNB.aerial.ubuntu22.sanitize-address @@ -25,7 +25,7 @@ # #--------------------------------------------------------------------- -FROM ran-base:latest as ran-build +FROM ran-base:latest AS ran-build RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \ @@ -58,7 +58,7 @@ RUN /bin/sh oaienv && \ #start from scratch for target executable -FROM ubuntu:jammy as oai-gnb-aerial +FROM ubuntu:jammy AS oai-gnb-aerial ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Europe diff --git a/docker/Dockerfile.gNB.aw2s.rhel9 b/docker/Dockerfile.gNB.aw2s.rhel9 index 926e2a2e75..db4b0f60c6 100644 --- a/docker/Dockerfile.gNB.aw2s.rhel9 +++ b/docker/Dockerfile.gNB.aw2s.rhel9 @@ -38,7 +38,7 @@ RUN /bin/sh oaienv && \ ./build_oai -w AW2SORI -t Ethernet #start from scratch for target executable -FROM registry.access.redhat.com/ubi9/ubi:latest as oai-gnb-aw2s +FROM registry.access.redhat.com/ubi9/ubi:latest AS oai-gnb-aw2s ENV TZ=Europe/Paris RUN dnf update -y && \ diff --git a/docker/Dockerfile.gNB.aw2s.rocky b/docker/Dockerfile.gNB.aw2s.rocky index 269eb4be3f..bdd1eb4e38 100644 --- a/docker/Dockerfile.gNB.aw2s.rocky +++ b/docker/Dockerfile.gNB.aw2s.rocky @@ -39,7 +39,7 @@ RUN /bin/sh oaienv && \ ./build_oai -w AW2SORI -t Ethernet #start from scratch for target executable -FROM $BASE_IMAGE as oai-gnb-aw2s +FROM $BASE_IMAGE AS oai-gnb-aw2s ENV TZ=Europe/Paris RUN dnf update -y && \ diff --git a/docker/Dockerfile.gNB.fhi72.rhel9 b/docker/Dockerfile.gNB.fhi72.rhel9 index 6bac3c71d9..0d629ac8a1 100644 --- a/docker/Dockerfile.gNB.fhi72.rhel9 +++ b/docker/Dockerfile.gNB.fhi72.rhel9 @@ -25,12 +25,12 @@ # #--------------------------------------------------------------------- -FROM ran-base:latest as gnb-base +FROM ran-base:latest AS gnb-base -FROM ran-build-fhi72:latest as gnb-build +FROM ran-build-fhi72:latest AS gnb-build #start from scratch for target executable -FROM registry.access.redhat.com/ubi9/ubi:latest as oai-gnb-fhi72 +FROM registry.access.redhat.com/ubi9/ubi:latest AS oai-gnb-fhi72 ENV TZ=Europe/Paris # Copy the entitlements diff --git a/docker/Dockerfile.gNB.fhi72.ubuntu22 b/docker/Dockerfile.gNB.fhi72.ubuntu22 index 5bb0ad5234..31f2392af7 100644 --- a/docker/Dockerfile.gNB.fhi72.ubuntu22 +++ b/docker/Dockerfile.gNB.fhi72.ubuntu22 @@ -25,13 +25,13 @@ # #--------------------------------------------------------------------- -FROM ran-base:latest as gnb-base +FROM ran-base:latest AS gnb-base -FROM ran-build-fhi72:latest as gnb-build +FROM ran-build-fhi72:latest AS gnb-build #start from scratch for target executable -FROM ubuntu:jammy as oai-gnb +FROM ubuntu:jammy AS oai-gnb ARG BUILD_OPTION ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Europe diff --git a/docker/Dockerfile.gNB.rhel9 b/docker/Dockerfile.gNB.rhel9 index d4f20b1cd0..e8fd8a9433 100644 --- a/docker/Dockerfile.gNB.rhel9 +++ b/docker/Dockerfile.gNB.rhel9 @@ -31,7 +31,7 @@ FROM ran-build:latest AS gnb-build #start from scratch for target executable -FROM registry.access.redhat.com/ubi9/ubi:latest as oai-gnb +FROM registry.access.redhat.com/ubi9/ubi:latest AS oai-gnb ENV TZ=Europe/Paris RUN dnf update -y && \ diff --git a/docker/Dockerfile.gNB.rocky b/docker/Dockerfile.gNB.rocky index 2e59a0d230..c1665e5a86 100644 --- a/docker/Dockerfile.gNB.rocky +++ b/docker/Dockerfile.gNB.rocky @@ -32,7 +32,7 @@ FROM ran-build:latest AS gnb-build #start from scratch for target executable -FROM $BASE_IMAGE as oai-gnb +FROM $BASE_IMAGE AS oai-gnb ENV TZ=Europe/Paris RUN dnf update -y && \ diff --git a/docker/Dockerfile.gNB.ubuntu22 b/docker/Dockerfile.gNB.ubuntu22 index 6ac01d7139..77a7ac0207 100644 --- a/docker/Dockerfile.gNB.ubuntu22 +++ b/docker/Dockerfile.gNB.ubuntu22 @@ -25,13 +25,13 @@ # #--------------------------------------------------------------------- -FROM ran-base:latest as gnb-base +FROM ran-base:latest AS gnb-base FROM ran-build:latest AS gnb-build #start from scratch for target executable -FROM ubuntu:jammy as oai-gnb +FROM ubuntu:jammy AS oai-gnb ARG BUILD_OPTION ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Europe/Paris diff --git a/docker/Dockerfile.lteRU.rhel9 b/docker/Dockerfile.lteRU.rhel9 index d57c88bbf4..18ef1e8cfd 100644 --- a/docker/Dockerfile.lteRU.rhel9 +++ b/docker/Dockerfile.lteRU.rhel9 @@ -31,7 +31,7 @@ FROM ran-build:latest AS ru-build #start from scratch for target executable -FROM registry.access.redhat.com/ubi9/ubi:latest as oai-lte-ru +FROM registry.access.redhat.com/ubi9/ubi:latest AS oai-lte-ru ENV TZ=Europe/Paris RUN dnf update -y && \ diff --git a/docker/Dockerfile.lteRU.ubuntu22 b/docker/Dockerfile.lteRU.ubuntu22 index 83a3e950ab..0f5f68932a 100644 --- a/docker/Dockerfile.lteRU.ubuntu22 +++ b/docker/Dockerfile.lteRU.ubuntu22 @@ -25,13 +25,13 @@ # #--------------------------------------------------------------------- -FROM ran-base:latest as ru-base +FROM ran-base:latest AS ru-base FROM ran-build:latest AS ru-build #start from scratch for target executable -FROM ubuntu:jammy as oai-lte-ru +FROM ubuntu:jammy AS oai-lte-ru ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Europe/Paris diff --git a/docker/Dockerfile.lteUE.rhel9 b/docker/Dockerfile.lteUE.rhel9 index 84854c2104..9ddf9e1f32 100644 --- a/docker/Dockerfile.lteUE.rhel9 +++ b/docker/Dockerfile.lteUE.rhel9 @@ -31,7 +31,7 @@ FROM ran-build:latest AS lte-ue-build #start from scratch for target executable -FROM registry.access.redhat.com/ubi9/ubi:latest as oai-lte-ue +FROM registry.access.redhat.com/ubi9/ubi:latest AS oai-lte-ue ENV TZ=Europe/Paris RUN dnf update -y && \ diff --git a/docker/Dockerfile.lteUE.rocky b/docker/Dockerfile.lteUE.rocky index 54b5dfa52a..4d98776c1d 100644 --- a/docker/Dockerfile.lteUE.rocky +++ b/docker/Dockerfile.lteUE.rocky @@ -32,7 +32,7 @@ FROM ran-build:latest AS lte-ue-build #start from scratch for target executable -FROM $BASE_IMAGE as oai-lte-ue +FROM $BASE_IMAGE AS oai-lte-ue ENV TZ=Europe/Paris RUN dnf update -y && \ diff --git a/docker/Dockerfile.lteUE.ubuntu22 b/docker/Dockerfile.lteUE.ubuntu22 index 057b6d17dc..5174dab36a 100644 --- a/docker/Dockerfile.lteUE.ubuntu22 +++ b/docker/Dockerfile.lteUE.ubuntu22 @@ -31,7 +31,7 @@ FROM ran-build:latest AS lte-ue-build #start from scratch for target executable -FROM ubuntu:jammy as oai-lte-ue +FROM ubuntu:jammy AS oai-lte-ue ARG BUILD_OPTION ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Europe/Paris diff --git a/docker/Dockerfile.nr-cuup.rhel9 b/docker/Dockerfile.nr-cuup.rhel9 index c10560e13f..08ee72fa30 100644 --- a/docker/Dockerfile.nr-cuup.rhel9 +++ b/docker/Dockerfile.nr-cuup.rhel9 @@ -32,7 +32,7 @@ FROM ran-build:latest AS gnb-build RUN cp /oai-ran/docker/scripts/gnb_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh #start from scratch for target executable -FROM registry.access.redhat.com/ubi9/ubi:latest as oai-nr-cuup +FROM registry.access.redhat.com/ubi9/ubi:latest AS oai-nr-cuup ENV TZ=Europe/Paris RUN yum repolist --disablerepo=* && \ diff --git a/docker/Dockerfile.nr-cuup.rocky b/docker/Dockerfile.nr-cuup.rocky index e6803bce1a..7f0e8fc2f1 100644 --- a/docker/Dockerfile.nr-cuup.rocky +++ b/docker/Dockerfile.nr-cuup.rocky @@ -33,7 +33,7 @@ FROM ran-build:latest AS gnb-build RUN cp /oai-ran/docker/scripts/gnb_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh #start from scratch for target executable -FROM $BASE_IMAGE as oai-nr-cuup +FROM $BASE_IMAGE AS oai-nr-cuup ENV TZ=Europe/Paris RUN yum repolist --disablerepo=* && \ diff --git a/docker/Dockerfile.nr-cuup.ubuntu22 b/docker/Dockerfile.nr-cuup.ubuntu22 index b618a578be..af95cb5a9c 100644 --- a/docker/Dockerfile.nr-cuup.ubuntu22 +++ b/docker/Dockerfile.nr-cuup.ubuntu22 @@ -25,12 +25,12 @@ # #--------------------------------------------------------------------- -FROM ran-base:latest as gnb-base +FROM ran-base:latest AS gnb-base FROM ran-build:latest AS gnb-build -FROM ubuntu:jammy as oai-nr-cuup +FROM ubuntu:jammy AS oai-nr-cuup ARG BUILD_OPTION ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Europe diff --git a/docker/Dockerfile.nrUE.rhel9 b/docker/Dockerfile.nrUE.rhel9 index 7d5894c618..7279809fdb 100644 --- a/docker/Dockerfile.nrUE.rhel9 +++ b/docker/Dockerfile.nrUE.rhel9 @@ -31,7 +31,7 @@ FROM ran-build:latest AS nr-ue-build #start from scratch for target executable -FROM registry.access.redhat.com/ubi9/ubi:latest as oai-nr-ue +FROM registry.access.redhat.com/ubi9/ubi:latest AS oai-nr-ue ENV TZ=Europe/Paris RUN dnf update -y && \ diff --git a/docker/Dockerfile.nrUE.rocky b/docker/Dockerfile.nrUE.rocky index 88d6bd73ff..ec5ecf6a99 100644 --- a/docker/Dockerfile.nrUE.rocky +++ b/docker/Dockerfile.nrUE.rocky @@ -32,7 +32,7 @@ FROM ran-build:latest AS nr-ue-build #start from scratch for target executable -FROM $BASE_IMAGE as oai-nr-ue +FROM $BASE_IMAGE AS oai-nr-ue ENV TZ=Europe/Paris RUN dnf update -y && \ diff --git a/docker/Dockerfile.nrUE.ubuntu22 b/docker/Dockerfile.nrUE.ubuntu22 index 83aa918045..74ae9620b0 100644 --- a/docker/Dockerfile.nrUE.ubuntu22 +++ b/docker/Dockerfile.nrUE.ubuntu22 @@ -31,7 +31,7 @@ FROM ran-build:latest AS nr-ue-build #start from scratch for target executable -FROM ubuntu:jammy as oai-nr-ue +FROM ubuntu:jammy AS oai-nr-ue ARG BUILD_OPTION ENV DEBIAN_FRONTEND=noninteractive ENV TZ=Europe/Paris diff --git a/docker/Dockerfile.phySim.rhel9 b/docker/Dockerfile.phySim.rhel9 index ccfe8505a8..e568c6bc00 100644 --- a/docker/Dockerfile.phySim.rhel9 +++ b/docker/Dockerfile.phySim.rhel9 @@ -41,7 +41,7 @@ RUN /bin/sh oaienv && \ ./build_oai --phy_simulators --ninja --sanitize --noavx512 -c --cmake-opt -DCMAKE_C_FLAGS=-Werror --cmake-opt -DCMAKE_CXX_FLAGS=-Werror #start from scratch for target executable -FROM registry.access.redhat.com/ubi9/ubi:latest as oai-physim +FROM registry.access.redhat.com/ubi9/ubi:latest AS oai-physim RUN dnf update -y && \ dnf install -y \