maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/style-dockerfile-as-uppercase' into integration_2024_w31

Browse Source
This commit is contained in:
Jaroslava Fiedlerova
2024-08-02 12:04:45 +02:00
parent 9a1381a92e f6dcc19fe5
commit 1c58bc2e1a
33 changed files with 97 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci-scripts/docker/Dockerfile.cppcheck.xenial
+27
View File
@@ -1,5 +1,32 @@
#/*
# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
# * contributor license agreements. See the NOTICE file distributed with
# * this work for additional information regarding copyright ownership.
# * The OpenAirInterface Software Alliance licenses this file to You under
# * the OAI Public License, Version 1.1 (the "License"); you may not use this file
# * except in compliance with the License.
# * You may obtain a copy of the License at
# *
# * http://www.openairinterface.org/?page_id=698
# *
# * Unless required by applicable law or agreed to in writing, software
# * distributed under the License is distributed on an "AS IS" BASIS,
# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# * See the License for the specific language governing permissions and
# * limitations under the License.
# *-------------------------------------------------------------------------------
# * For more information about the OpenAirInterface (OAI) Software Alliance:
# * contact@openairinterface.org
# */
#---------------------------------------------------------------------
#
# Dockerfile for the Open-Air-Interface BUILD service
# Valid for Ubuntu 22.04
#
#---------------------------------------------------------------------
FROM ubuntu:xenial AS oai-cppcheck
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && \
ci-scripts/docker/Dockerfile.formatting.bionic
+27
View File
@@ -1,3 +1,30 @@
#/*
# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
# * contributor license agreements. See the NOTICE file distributed with
# * this work for additional information regarding copyright ownership.
# * The OpenAirInterface Software Alliance licenses this file to You under
# * the OAI Public License, Version 1.1 (the "License"); you may not use this file
# * except in compliance with the License.
# * You may obtain a copy of the License at
# *
# * http://www.openairinterface.org/?page_id=698
# *
# * Unless required by applicable law or agreed to in writing, software
# * distributed under the License is distributed on an "AS IS" BASIS,
# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# * See the License for the specific language governing permissions and
# * limitations under the License.
# *-------------------------------------------------------------------------------
# * For more information about the OpenAirInterface (OAI) Software Alliance:
# * contact@openairinterface.org
# */
#---------------------------------------------------------------------
#
# Dockerfile for the Open-Air-Interface BUILD service
# Valid for Ubuntu 22.04
#
#---------------------------------------------------------------------
FROM ubuntu:bionic AS oai-formatting-check
ARG MERGE_REQUEST
ci-scripts/docker/Dockerfile.unittest.ubuntu22
+1 -1
View File
@@ -25,7 +25,7 @@
#
#---------------------------------------------------------------------
FROM ran-base:develop as ran-tests
FROM ran-base:develop AS ran-tests
RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get upgrade --yes && \
docker/Dockerfile.build.fhi72.rhel9
+2 -2
View File
@@ -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
docker/Dockerfile.build.fhi72.ubuntu22
+2 -2
View File
@@ -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 && \
docker/Dockerfile.build.rhel9
+1 -1
View File
@@ -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
docker/Dockerfile.build.rocky
+1 -1
View File
@@ -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
docker/Dockerfile.build.ubuntu22
+1 -1
View File
@@ -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
docker/Dockerfile.build.ubuntu22.cross-arm64
+1 -1
View File
@@ -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
docker/Dockerfile.eNB.rhel9
+1 -1
View File
@@ -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 && \
docker/Dockerfile.eNB.rocky
+1 -1
View File
@@ -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 && \
docker/Dockerfile.eNB.ubuntu22
+2 -2
View File
@@ -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
docker/Dockerfile.gNB.aerial.ubuntu22
+2 -2
View File
@@ -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
docker/Dockerfile.gNB.aerial.ubuntu22.sanitize-address
+2 -2
View File
@@ -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
docker/Dockerfile.gNB.aw2s.rhel9
+1 -1
View File
@@ -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 && \
docker/Dockerfile.gNB.aw2s.rocky
+1 -1
View File
@@ -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 && \
docker/Dockerfile.gNB.fhi72.rhel9
+3 -3
View File
@@ -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
docker/Dockerfile.gNB.fhi72.ubuntu22
+3 -3
View File
@@ -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
docker/Dockerfile.gNB.rhel9
+1 -1
View File
@@ -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 && \
docker/Dockerfile.gNB.rocky
+1 -1
View File
@@ -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 && \
docker/Dockerfile.gNB.ubuntu22
+2 -2
View File
@@ -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
docker/Dockerfile.lteRU.rhel9
+1 -1
View File
@@ -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 && \
docker/Dockerfile.lteRU.ubuntu22
+2 -2
View File
@@ -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
docker/Dockerfile.lteUE.rhel9
+1 -1
View File
@@ -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 && \
docker/Dockerfile.lteUE.rocky
+1 -1
View File
@@ -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 && \
docker/Dockerfile.lteUE.ubuntu22
+1 -1
View File
@@ -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
docker/Dockerfile.nr-cuup.rhel9
+1 -1
View File
@@ -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=* && \
docker/Dockerfile.nr-cuup.rocky
+1 -1
View File
@@ -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=* && \
docker/Dockerfile.nr-cuup.ubuntu22
+2 -2
View File
@@ -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
docker/Dockerfile.nrUE.rhel9
+1 -1
View File
@@ -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 && \
docker/Dockerfile.nrUE.rocky
+1 -1
View File
@@ -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 && \
docker/Dockerfile.nrUE.ubuntu22
+1 -1
View File
@@ -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
docker/Dockerfile.phySim.rhel9
+1 -1
View File
@@ -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 \