Skip to content

Commit

Permalink
fixes oai docker image (#202)
Browse files Browse the repository at this point in the history
  • Loading branch information
avrodriguezgrad authored Jul 24, 2023
1 parent 461d9a5 commit 55940ae
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
9 changes: 3 additions & 6 deletions images/oai/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ubuntu:focal AS build

ARG version=2023.w24
ARG version=2023.w28

ENV VERSION=$version

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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/

Expand Down
2 changes: 1 addition & 1 deletion images/oai/image_info.sh
Original file line number Diff line number Diff line change
@@ -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=

0 comments on commit 55940ae

Please sign in to comment.