From 55940ae69f8ecbddc0c3ff79750e0a70db9c9c53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20V=C3=A1zquez?= Date: Mon, 24 Jul 2023 10:50:47 +0200 Subject: [PATCH] fixes oai docker image (#202) --- images/oai/Dockerfile | 9 +++------ images/oai/image_info.sh | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/images/oai/Dockerfile b/images/oai/Dockerfile index 6eeb6e6..6e9477f 100644 --- a/images/oai/Dockerfile +++ b/images/oai/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:focal AS build -ARG version=2023.w24 +ARG version=2023.w28 ENV VERSION=$version @@ -42,7 +42,7 @@ RUN /bin/sh oaienv && \ RUN /bin/sh oaienv && \ cd cmake_targets && \ mkdir -p log && \ - ./build_oai --eNB --gNB --RU --UE --nrUE --ninja --build-lib "telnetsrv enbscope uescope nrscope nrqtscope" -w USRP --verbose-ci --noavx512 -c --cmake-opt -DCMAKE_C_FLAGS=-Werror --cmake-opt -DCMAKE_CXX_FLAGS=-Werror + ./build_oai --eNB --gNB --RU --UE --nrUE --ninja --build-lib "telnetsrv enbscope uescope nrscope nrqtscope" -w USRP -t Ethernet --verbose-ci --noavx512 -c --cmake-opt -DCMAKE_C_FLAGS=-Werror --cmake-opt -DCMAKE_CXX_FLAGS=-Werror #start from scratch for target executable FROM ubuntu:focal as oai @@ -89,10 +89,7 @@ COPY --from=build \ /oai-ran/cmake_targets/nas_sim_tools/build/nvram \ /oai-ran/cmake_targets/nas_sim_tools/build/usim \ /oai-ran/cmake_targets/ran_build/build/nr-cuup \ - /opt/oai/bin/ -COPY --from=build \ - /oai-ran/ci-scripts/conf_files/nr-ue-sim.conf \ - /opt/oai/etc/ + /opt/oai/bin/ COPY --from=build /oai-ran/docker/scripts/*.sh / COPY --from=build /oai-ran/cmake_targets/ran_build/build/*.so /usr/local/lib/ diff --git a/images/oai/image_info.sh b/images/oai/image_info.sh index 1df2995..bd545cf 100644 --- a/images/oai/image_info.sh +++ b/images/oai/image_info.sh @@ -1,3 +1,3 @@ -IMAGE_TAG=2023.w26 +IMAGE_TAG=2023.w28 #comma separated list of platforms. If empty, image will not be multiarch. PLATFORMS=