Merge remote-tracking branch 'origin/docker-config-changes' into integration_2023_w23_ci
This commit is contained in:
@@ -29,8 +29,6 @@ FROM ran-base:latest AS ru-base
|
||||
|
||||
FROM ran-build:latest AS ru-build
|
||||
|
||||
RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/enb_parameters.yaml && \
|
||||
cp /oai-ran/docker/scripts/lte_ru_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh
|
||||
|
||||
#start from scratch for target executable
|
||||
FROM registry.access.redhat.com/ubi9/ubi:latest as oai-lte-ru
|
||||
@@ -54,9 +52,8 @@ RUN dnf update -y && \
|
||||
|
||||
WORKDIR /opt/oai-lte-ru/bin
|
||||
COPY --from=ru-build \
|
||||
/oai-ran/cmake_targets/ran_build/build/oairu \
|
||||
/oai-ran/docker/scripts/entrypoint.sh \
|
||||
.
|
||||
/oai-ran/cmake_targets/ran_build/build/oairu ./
|
||||
COPY ./docker/scripts/lte_ru_entrypoint.sh ./entrypoint.sh
|
||||
|
||||
COPY --from=ru-build \
|
||||
/oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
|
||||
@@ -95,10 +92,6 @@ COPY --from=ru-base /usr/local/share/uhd/rfnoc/ .
|
||||
RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai_device.so" && \
|
||||
ldconfig
|
||||
|
||||
# Copy the relevant configuration files for RRU
|
||||
WORKDIR /opt/oai-lte-ru/etc
|
||||
COPY --from=ru-build /oai-ran/docker/etc/rru* ./
|
||||
|
||||
WORKDIR /opt/oai-lte-ru
|
||||
|
||||
ENTRYPOINT ["/opt/oai-lte-ru/bin/entrypoint.sh"]
|
||||
|
||||
Reference in New Issue
Block a user