style(docker): newer versions of docker require keyword as to be of same case as from
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
This commit is contained in:
@@ -25,7 +25,7 @@
|
|||||||
#
|
#
|
||||||
#---------------------------------------------------------------------
|
#---------------------------------------------------------------------
|
||||||
|
|
||||||
FROM ran-base:latest as ran-base
|
FROM ran-base:latest AS ran-base
|
||||||
ENV TZ=Europe
|
ENV TZ=Europe
|
||||||
|
|
||||||
RUN rm -Rf /oai-ran
|
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 && \
|
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
|
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 E2AP_VERSION=E2AP_V3
|
||||||
ARG KPM_VERSION=KPM_V3_00
|
ARG KPM_VERSION=KPM_V3_00
|
||||||
|
|
||||||
|
|||||||
@@ -25,7 +25,7 @@
|
|||||||
#
|
#
|
||||||
#---------------------------------------------------------------------
|
#---------------------------------------------------------------------
|
||||||
|
|
||||||
FROM ran-base:latest as ran-base
|
FROM ran-base:latest AS ran-base
|
||||||
|
|
||||||
ARG E2AP_VERSION=E2AP_V3
|
ARG E2AP_VERSION=E2AP_V3
|
||||||
ARG KPM_VERSION=KPM_V3_00
|
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 && \
|
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
|
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
|
## Build and install OAI
|
||||||
#run build_oai to build the target image
|
#run build_oai to build the target image
|
||||||
RUN /bin/sh oaienv && \
|
RUN /bin/sh oaienv && \
|
||||||
|
|||||||
@@ -25,7 +25,7 @@
|
|||||||
#
|
#
|
||||||
#---------------------------------------------------------------------
|
#---------------------------------------------------------------------
|
||||||
|
|
||||||
FROM ran-base:latest as ran-build
|
FROM ran-base:latest AS ran-build
|
||||||
|
|
||||||
RUN rm -Rf /oai-ran
|
RUN rm -Rf /oai-ran
|
||||||
WORKDIR /oai-ran
|
WORKDIR /oai-ran
|
||||||
|
|||||||
@@ -25,7 +25,7 @@
|
|||||||
#
|
#
|
||||||
#---------------------------------------------------------------------
|
#---------------------------------------------------------------------
|
||||||
|
|
||||||
FROM ran-base:latest as ran-build
|
FROM ran-base:latest AS ran-build
|
||||||
|
|
||||||
RUN rm -Rf /oai-ran
|
RUN rm -Rf /oai-ran
|
||||||
WORKDIR /oai-ran
|
WORKDIR /oai-ran
|
||||||
|
|||||||
@@ -25,7 +25,7 @@
|
|||||||
#
|
#
|
||||||
#---------------------------------------------------------------------
|
#---------------------------------------------------------------------
|
||||||
|
|
||||||
FROM ran-base:latest as ran-build
|
FROM ran-base:latest AS ran-build
|
||||||
ARG BUILD_OPTION
|
ARG BUILD_OPTION
|
||||||
|
|
||||||
RUN rm -Rf /oai-ran
|
RUN rm -Rf /oai-ran
|
||||||
|
|||||||
@@ -25,7 +25,7 @@
|
|||||||
#
|
#
|
||||||
#---------------------------------------------------------------------
|
#---------------------------------------------------------------------
|
||||||
|
|
||||||
FROM ran-base:latest as ran-build
|
FROM ran-base:latest AS ran-build
|
||||||
|
|
||||||
RUN rm -Rf /oai-ran
|
RUN rm -Rf /oai-ran
|
||||||
WORKDIR /oai-ran
|
WORKDIR /oai-ran
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ FROM ran-build:latest AS enb-build
|
|||||||
|
|
||||||
|
|
||||||
#start from scratch for target executable
|
#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
|
ENV TZ=Europe/Paris
|
||||||
|
|
||||||
RUN dnf update -y && \
|
RUN dnf update -y && \
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ FROM ran-build:latest AS enb-build
|
|||||||
|
|
||||||
|
|
||||||
#start from scratch for target executable
|
#start from scratch for target executable
|
||||||
FROM $BASE_IMAGE as oai-enb
|
FROM $BASE_IMAGE AS oai-enb
|
||||||
ENV TZ=Europe/Paris
|
ENV TZ=Europe/Paris
|
||||||
|
|
||||||
RUN dnf update -y && \
|
RUN dnf update -y && \
|
||||||
|
|||||||
@@ -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
|
FROM ran-build:latest AS enb-build
|
||||||
|
|
||||||
|
|
||||||
#start from scratch for target executable
|
#start from scratch for target executable
|
||||||
FROM ubuntu:jammy as oai-enb
|
FROM ubuntu:jammy AS oai-enb
|
||||||
ARG BUILD_OPTION
|
ARG BUILD_OPTION
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
ENV TZ=Europe/Paris
|
ENV TZ=Europe/Paris
|
||||||
|
|||||||
@@ -25,7 +25,7 @@
|
|||||||
#
|
#
|
||||||
#---------------------------------------------------------------------
|
#---------------------------------------------------------------------
|
||||||
|
|
||||||
FROM ran-base:latest as ran-build
|
FROM ran-base:latest AS ran-build
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \
|
DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \
|
||||||
@@ -58,7 +58,7 @@ RUN /bin/sh oaienv && \
|
|||||||
|
|
||||||
|
|
||||||
#start from scratch for target executable
|
#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 DEBIAN_FRONTEND=noninteractive
|
||||||
ENV TZ=Europe
|
ENV TZ=Europe
|
||||||
|
|
||||||
|
|||||||
@@ -25,7 +25,7 @@
|
|||||||
#
|
#
|
||||||
#---------------------------------------------------------------------
|
#---------------------------------------------------------------------
|
||||||
|
|
||||||
FROM ran-base:latest as ran-build
|
FROM ran-base:latest AS ran-build
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \
|
DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \
|
||||||
@@ -58,7 +58,7 @@ RUN /bin/sh oaienv && \
|
|||||||
|
|
||||||
|
|
||||||
#start from scratch for target executable
|
#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 DEBIAN_FRONTEND=noninteractive
|
||||||
ENV TZ=Europe
|
ENV TZ=Europe
|
||||||
|
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ RUN /bin/sh oaienv && \
|
|||||||
./build_oai -w AW2SORI -t Ethernet
|
./build_oai -w AW2SORI -t Ethernet
|
||||||
|
|
||||||
#start from scratch for target executable
|
#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
|
ENV TZ=Europe/Paris
|
||||||
|
|
||||||
RUN dnf update -y && \
|
RUN dnf update -y && \
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ RUN /bin/sh oaienv && \
|
|||||||
./build_oai -w AW2SORI -t Ethernet
|
./build_oai -w AW2SORI -t Ethernet
|
||||||
|
|
||||||
#start from scratch for target executable
|
#start from scratch for target executable
|
||||||
FROM $BASE_IMAGE as oai-gnb-aw2s
|
FROM $BASE_IMAGE AS oai-gnb-aw2s
|
||||||
ENV TZ=Europe/Paris
|
ENV TZ=Europe/Paris
|
||||||
|
|
||||||
RUN dnf update -y && \
|
RUN dnf update -y && \
|
||||||
|
|||||||
@@ -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
|
#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
|
ENV TZ=Europe/Paris
|
||||||
|
|
||||||
# Copy the entitlements
|
# Copy the entitlements
|
||||||
|
|||||||
@@ -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
|
#start from scratch for target executable
|
||||||
FROM ubuntu:jammy as oai-gnb
|
FROM ubuntu:jammy AS oai-gnb
|
||||||
ARG BUILD_OPTION
|
ARG BUILD_OPTION
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
ENV TZ=Europe
|
ENV TZ=Europe
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ FROM ran-build:latest AS gnb-build
|
|||||||
|
|
||||||
|
|
||||||
#start from scratch for target executable
|
#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
|
ENV TZ=Europe/Paris
|
||||||
|
|
||||||
RUN dnf update -y && \
|
RUN dnf update -y && \
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ FROM ran-build:latest AS gnb-build
|
|||||||
|
|
||||||
|
|
||||||
#start from scratch for target executable
|
#start from scratch for target executable
|
||||||
FROM $BASE_IMAGE as oai-gnb
|
FROM $BASE_IMAGE AS oai-gnb
|
||||||
ENV TZ=Europe/Paris
|
ENV TZ=Europe/Paris
|
||||||
|
|
||||||
RUN dnf update -y && \
|
RUN dnf update -y && \
|
||||||
|
|||||||
@@ -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
|
FROM ran-build:latest AS gnb-build
|
||||||
|
|
||||||
|
|
||||||
#start from scratch for target executable
|
#start from scratch for target executable
|
||||||
FROM ubuntu:jammy as oai-gnb
|
FROM ubuntu:jammy AS oai-gnb
|
||||||
ARG BUILD_OPTION
|
ARG BUILD_OPTION
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
ENV TZ=Europe/Paris
|
ENV TZ=Europe/Paris
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ FROM ran-build:latest AS ru-build
|
|||||||
|
|
||||||
|
|
||||||
#start from scratch for target executable
|
#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
|
ENV TZ=Europe/Paris
|
||||||
|
|
||||||
RUN dnf update -y && \
|
RUN dnf update -y && \
|
||||||
|
|||||||
@@ -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
|
FROM ran-build:latest AS ru-build
|
||||||
|
|
||||||
|
|
||||||
#start from scratch for target executable
|
#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 DEBIAN_FRONTEND=noninteractive
|
||||||
ENV TZ=Europe/Paris
|
ENV TZ=Europe/Paris
|
||||||
|
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ FROM ran-build:latest AS lte-ue-build
|
|||||||
|
|
||||||
|
|
||||||
#start from scratch for target executable
|
#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
|
ENV TZ=Europe/Paris
|
||||||
|
|
||||||
RUN dnf update -y && \
|
RUN dnf update -y && \
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ FROM ran-build:latest AS lte-ue-build
|
|||||||
|
|
||||||
|
|
||||||
#start from scratch for target executable
|
#start from scratch for target executable
|
||||||
FROM $BASE_IMAGE as oai-lte-ue
|
FROM $BASE_IMAGE AS oai-lte-ue
|
||||||
ENV TZ=Europe/Paris
|
ENV TZ=Europe/Paris
|
||||||
|
|
||||||
RUN dnf update -y && \
|
RUN dnf update -y && \
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ FROM ran-build:latest AS lte-ue-build
|
|||||||
|
|
||||||
|
|
||||||
#start from scratch for target executable
|
#start from scratch for target executable
|
||||||
FROM ubuntu:jammy as oai-lte-ue
|
FROM ubuntu:jammy AS oai-lte-ue
|
||||||
ARG BUILD_OPTION
|
ARG BUILD_OPTION
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
ENV TZ=Europe/Paris
|
ENV TZ=Europe/Paris
|
||||||
|
|||||||
@@ -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
|
RUN cp /oai-ran/docker/scripts/gnb_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh
|
||||||
|
|
||||||
#start from scratch for target executable
|
#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
|
ENV TZ=Europe/Paris
|
||||||
|
|
||||||
RUN yum repolist --disablerepo=* && \
|
RUN yum repolist --disablerepo=* && \
|
||||||
|
|||||||
@@ -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
|
RUN cp /oai-ran/docker/scripts/gnb_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh
|
||||||
|
|
||||||
#start from scratch for target executable
|
#start from scratch for target executable
|
||||||
FROM $BASE_IMAGE as oai-nr-cuup
|
FROM $BASE_IMAGE AS oai-nr-cuup
|
||||||
ENV TZ=Europe/Paris
|
ENV TZ=Europe/Paris
|
||||||
|
|
||||||
RUN yum repolist --disablerepo=* && \
|
RUN yum repolist --disablerepo=* && \
|
||||||
|
|||||||
@@ -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 ran-build:latest AS gnb-build
|
||||||
|
|
||||||
|
|
||||||
FROM ubuntu:jammy as oai-nr-cuup
|
FROM ubuntu:jammy AS oai-nr-cuup
|
||||||
ARG BUILD_OPTION
|
ARG BUILD_OPTION
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
ENV TZ=Europe
|
ENV TZ=Europe
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ FROM ran-build:latest AS nr-ue-build
|
|||||||
|
|
||||||
|
|
||||||
#start from scratch for target executable
|
#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
|
ENV TZ=Europe/Paris
|
||||||
|
|
||||||
RUN dnf update -y && \
|
RUN dnf update -y && \
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ FROM ran-build:latest AS nr-ue-build
|
|||||||
|
|
||||||
|
|
||||||
#start from scratch for target executable
|
#start from scratch for target executable
|
||||||
FROM $BASE_IMAGE as oai-nr-ue
|
FROM $BASE_IMAGE AS oai-nr-ue
|
||||||
ENV TZ=Europe/Paris
|
ENV TZ=Europe/Paris
|
||||||
|
|
||||||
RUN dnf update -y && \
|
RUN dnf update -y && \
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ FROM ran-build:latest AS nr-ue-build
|
|||||||
|
|
||||||
|
|
||||||
#start from scratch for target executable
|
#start from scratch for target executable
|
||||||
FROM ubuntu:jammy as oai-nr-ue
|
FROM ubuntu:jammy AS oai-nr-ue
|
||||||
ARG BUILD_OPTION
|
ARG BUILD_OPTION
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
ENV TZ=Europe/Paris
|
ENV TZ=Europe/Paris
|
||||||
|
|||||||
@@ -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
|
./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
|
#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 && \
|
RUN dnf update -y && \
|
||||||
dnf install -y \
|
dnf install -y \
|
||||||
|
|||||||
Reference in New Issue
Block a user