diff --git a/docker/Dockerfile.eNB.rhel8.2 b/docker/Dockerfile.eNB.rhel8.2 index f52f6d9566..8fa954aca3 100644 --- a/docker/Dockerfile.eNB.rhel8.2 +++ b/docker/Dockerfile.eNB.rhel8.2 @@ -29,8 +29,6 @@ FROM ran-base:latest AS enb-base FROM ran-build:latest AS enb-build -RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/enb_parameters.yaml && \ - cp /oai-ran/docker/scripts/enb_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh #start from scratch for target executable FROM registry.access.redhat.com/ubi8/ubi:latest as oai-enb @@ -55,9 +53,9 @@ RUN yum update -y && \ WORKDIR /opt/oai-enb/bin COPY --from=enb-build \ - /oai-ran/cmake_targets/ran_build/build/lte-softmodem \ - /oai-ran/docker/scripts/entrypoint.sh \ - ./ + /oai-ran/cmake_targets/ran_build/build/lte-softmodem ./ + +COPY ./docker/scripts/enb_entrypoint.sh ./entrypoint.sh COPY --from=enb-build \ /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \ @@ -104,9 +102,6 @@ COPY --from=enb-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 eNB -WORKDIR /opt/oai-enb/etc -COPY --from=enb-build /oai-ran/docker/etc . WORKDIR /opt/oai-enb diff --git a/docker/Dockerfile.eNB.ubuntu20 b/docker/Dockerfile.eNB.ubuntu20 index 86f9569a30..e3b4261526 100644 --- a/docker/Dockerfile.eNB.ubuntu20 +++ b/docker/Dockerfile.eNB.ubuntu20 @@ -29,8 +29,6 @@ FROM ran-base:latest as enb-base FROM ran-build:latest AS enb-build -RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/enb_parameters.yaml && \ - cp /oai-ran/docker/scripts/enb_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh #start from scratch for target executable FROM ubuntu:focal as oai-enb @@ -63,9 +61,8 @@ RUN apt-get update && \ WORKDIR /opt/oai-enb/bin COPY --from=enb-build \ - /oai-ran/cmake_targets/ran_build/build/lte-softmodem \ - /oai-ran/docker/scripts/entrypoint.sh \ - ./ + /oai-ran/cmake_targets/ran_build/build/lte-softmodem ./ +COPY ./docker/scripts/enb_entrypoint.sh ./entrypoint.sh COPY --from=enb-build \ /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \ @@ -97,9 +94,6 @@ COPY --from=enb-base \ 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 eNB -WORKDIR /opt/oai-enb/etc -COPY --from=enb-build /oai-ran/docker/etc . WORKDIR /opt/oai-enb diff --git a/docker/Dockerfile.gNB.rhel8.2 b/docker/Dockerfile.gNB.rhel8.2 index 187de03e37..04baef36a5 100644 --- a/docker/Dockerfile.gNB.rhel8.2 +++ b/docker/Dockerfile.gNB.rhel8.2 @@ -29,8 +29,6 @@ FROM ran-base:latest AS gnb-base FROM ran-build:latest AS gnb-build -RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/gnb_parameters.yaml && \ - 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/ubi8/ubi:latest as oai-gnb @@ -57,9 +55,8 @@ RUN yum repolist --disablerepo=* && \ WORKDIR /opt/oai-gnb/bin COPY --from=gnb-build \ - /oai-ran/cmake_targets/ran_build/build/nr-softmodem \ - /oai-ran/docker/scripts/entrypoint.sh \ - ./ + /oai-ran/cmake_targets/ran_build/build/nr-softmodem ./ +COPY ./docker/scripts/gnb_entrypoint.sh ./entrypoint.sh COPY --from=gnb-build \ /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \ @@ -109,10 +106,6 @@ COPY --from=gnb-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 gNB -WORKDIR /opt/oai-gnb/etc -COPY --from=gnb-build /oai-ran/docker/etc . - WORKDIR /opt/oai-gnb #EXPOSE 2152/udp # S1U, GTP/UDP #EXPOSE 22100/tcp # ? diff --git a/docker/Dockerfile.gNB.ubuntu20 b/docker/Dockerfile.gNB.ubuntu20 index 07d1413093..fe2d65dc85 100644 --- a/docker/Dockerfile.gNB.ubuntu20 +++ b/docker/Dockerfile.gNB.ubuntu20 @@ -29,8 +29,6 @@ FROM ran-base:latest as gnb-base FROM ran-build:latest AS gnb-build -RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/gnb_parameters.yaml && \ - cp /oai-ran/docker/scripts/gnb_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh #start from scratch for target executable FROM ubuntu:focal as oai-gnb @@ -62,9 +60,8 @@ RUN apt-get update && \ WORKDIR /opt/oai-gnb/bin COPY --from=gnb-build \ - /oai-ran/cmake_targets/ran_build/build/nr-softmodem \ - /oai-ran/docker/scripts/entrypoint.sh \ - ./ + /oai-ran/cmake_targets/ran_build/build/nr-softmodem ./ +COPY ./docker/scripts/gnb_entrypoint.sh ./entrypoint.sh COPY --from=gnb-build \ /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \ @@ -99,10 +96,6 @@ COPY --from=gnb-base \ 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 gNB -WORKDIR /opt/oai-gnb/etc -COPY --from=gnb-build /oai-ran/docker/etc . - WORKDIR /opt/oai-gnb #EXPOSE 2152/udp # S1U, GTP/UDP #EXPOSE 22100/tcp # ? diff --git a/docker/Dockerfile.lteRU.rhel8.2 b/docker/Dockerfile.lteRU.rhel8.2 index b4d53f367b..e8661812bc 100644 --- a/docker/Dockerfile.lteRU.rhel8.2 +++ b/docker/Dockerfile.lteRU.rhel8.2 @@ -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/ubi8/ubi:latest as oai-lte-ru @@ -54,9 +52,8 @@ RUN yum 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"] diff --git a/docker/Dockerfile.lteRU.ubuntu20 b/docker/Dockerfile.lteRU.ubuntu20 index 51eac941f7..1a476c5733 100644 --- a/docker/Dockerfile.lteRU.ubuntu20 +++ b/docker/Dockerfile.lteRU.ubuntu20 @@ -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 ubuntu:focal as oai-lte-ru @@ -59,9 +57,8 @@ RUN apt-get update && \ 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 \ @@ -89,10 +86,6 @@ COPY --from=ru-base \ 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"] diff --git a/docker/Dockerfile.lteUE.rhel8.2 b/docker/Dockerfile.lteUE.rhel8.2 index 3bbcbb5d4b..fe9cb2e6fc 100644 --- a/docker/Dockerfile.lteUE.rhel8.2 +++ b/docker/Dockerfile.lteUE.rhel8.2 @@ -29,9 +29,6 @@ FROM ran-base:latest AS lte-ue-base FROM ran-build:latest AS lte-ue-build -RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/lte_ue_parameters.yaml && \ - python3 ./docker/scripts/generateTemplate.py ./docker/scripts/lte_ue_sim_parameters.yaml && \ - cp /oai-ran/docker/scripts/lte_ue_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh #start from scratch for target executable FROM registry.access.redhat.com/ubi8/ubi:latest as oai-lte-ue @@ -57,12 +54,12 @@ RUN yum update -y && \ WORKDIR /opt/oai-lte-ue/bin COPY --from=lte-ue-build \ /oai-ran/cmake_targets/ran_build/build/lte-uesoftmodem \ - /oai-ran/docker/scripts/entrypoint.sh \ /oai-ran/cmake_targets/nas_sim_tools/build/conf2uedata \ /oai-ran/cmake_targets/nas_sim_tools/build/nvram \ /oai-ran/cmake_targets/nas_sim_tools/build/usim \ ./ +COPY ./docker/scripts/lte_ue_entrypoint.sh ./entrypoint.sh COPY --from=lte-ue-build \ /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \ /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \ @@ -105,10 +102,6 @@ COPY --from=lte-ue-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 UE -WORKDIR /opt/oai-lte-ue/etc -COPY --from=lte-ue-build /oai-ran/docker/etc . - WORKDIR /opt/oai-lte-ue CMD ["/opt/oai-lte-ue/bin/lte-uesoftmodem"] ENTRYPOINT ["/opt/oai-lte-ue/bin/entrypoint.sh"] diff --git a/docker/Dockerfile.lteUE.ubuntu20 b/docker/Dockerfile.lteUE.ubuntu20 index 06e2d0c669..7b09b45b3e 100644 --- a/docker/Dockerfile.lteUE.ubuntu20 +++ b/docker/Dockerfile.lteUE.ubuntu20 @@ -29,9 +29,6 @@ FROM ran-base:latest AS lte-ue-base FROM ran-build:latest AS lte-ue-build -RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/lte_ue_parameters.yaml && \ - python3 ./docker/scripts/generateTemplate.py ./docker/scripts/lte_ue_sim_parameters.yaml && \ - cp /oai-ran/docker/scripts/lte_ue_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh #start from scratch for target executable FROM ubuntu:focal as oai-lte-ue @@ -63,12 +60,12 @@ RUN apt-get update && \ WORKDIR /opt/oai-lte-ue/bin COPY --from=lte-ue-build \ /oai-ran/cmake_targets/ran_build/build/lte-uesoftmodem \ - /oai-ran/docker/scripts/entrypoint.sh \ /oai-ran/cmake_targets/nas_sim_tools/build/conf2uedata \ /oai-ran/cmake_targets/nas_sim_tools/build/nvram \ /oai-ran/cmake_targets/nas_sim_tools/build/usim \ ./ +COPY ./docker/scripts/lte_ue_entrypoint.sh ./entrypoint.sh COPY --from=lte-ue-build \ /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \ /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \ @@ -98,10 +95,6 @@ COPY --from=lte-ue-base \ 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 UE -WORKDIR /opt/oai-lte-ue/etc -COPY --from=lte-ue-build /oai-ran/docker/etc . - WORKDIR /opt/oai-lte-ue CMD ["/opt/oai-lte-ue/bin/lte-uesoftmodem"] ENTRYPOINT ["/opt/oai-lte-ue/bin/entrypoint.sh"] diff --git a/docker/Dockerfile.nr-cuup.ubuntu20 b/docker/Dockerfile.nr-cuup.ubuntu20 index e836d87fef..408728093f 100644 --- a/docker/Dockerfile.nr-cuup.ubuntu20 +++ b/docker/Dockerfile.nr-cuup.ubuntu20 @@ -29,7 +29,6 @@ FROM ran-base:latest as gnb-base FROM ran-build:latest AS gnb-build -RUN cp /oai-ran/docker/scripts/gnb_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh FROM ubuntu:focal as oai-nr-cuup ENV DEBIAN_FRONTEND=noninteractive @@ -46,9 +45,8 @@ RUN apt-get update && \ WORKDIR /opt/oai-gnb/bin COPY --from=gnb-build \ /oai-ran/cmake_targets/ran_build/build/nr-cuup \ - /oai-ran/docker/scripts/entrypoint.sh \ ./ - +COPY ./docker/scripts/gnb_entrypoint.sh ./entrypoint.sh COPY --from=gnb-build \ /oai-ran/cmake_targets/ran_build/build/librfsimulator.so \ /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \ diff --git a/docker/Dockerfile.nrUE.rhel8.2 b/docker/Dockerfile.nrUE.rhel8.2 index 6242eb4c91..d1e8db5c25 100644 --- a/docker/Dockerfile.nrUE.rhel8.2 +++ b/docker/Dockerfile.nrUE.rhel8.2 @@ -29,8 +29,6 @@ FROM ran-base:latest AS nr-ue-base FROM ran-build:latest AS nr-ue-build -RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/nr_ue_parameters.yaml && \ - cp /oai-ran/docker/scripts/nr_ue_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh #start from scratch for target executable FROM registry.access.redhat.com/ubi8/ubi:latest as oai-nr-ue @@ -58,13 +56,11 @@ RUN yum update -y && \ WORKDIR /opt/oai-nr-ue/bin COPY --from=nr-ue-build \ /oai-ran/cmake_targets/ran_build/build/nr-uesoftmodem \ - /oai-ran/docker/scripts/entrypoint.sh \ ./ - +COPY ./docker/scripts/nr_ue_entrypoint.sh ./entrypoint.sh WORKDIR /opt/oai-nr-ue/etc COPY --from=nr-ue-build \ /oai-ran/ci-scripts/conf_files/nr-ue-sim.conf \ - /oai-ran/docker/etc/nr-ue.nfapi.conf \ ./ COPY --from=nr-ue-build \ @@ -115,9 +111,6 @@ COPY --from=nr-ue-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 eNB -WORKDIR /opt/oai-nr-ue/etc -COPY --from=nr-ue-build /oai-ran/ci-scripts/conf_files/ue.* . WORKDIR /opt/oai-nr-ue CMD ["/opt/oai-nr-ue/bin/nr-uesoftmodem", "-O", "/opt/oai-nr-ue/etc/nr-ue.conf"] diff --git a/docker/Dockerfile.nrUE.ubuntu20 b/docker/Dockerfile.nrUE.ubuntu20 index f462fa9632..0eb22c818f 100644 --- a/docker/Dockerfile.nrUE.ubuntu20 +++ b/docker/Dockerfile.nrUE.ubuntu20 @@ -29,8 +29,6 @@ FROM ran-base:latest AS nr-ue-base FROM ran-build:latest AS nr-ue-build -RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/nr_ue_parameters.yaml && \ - cp /oai-ran/docker/scripts/nr_ue_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh #start from scratch for target executable FROM ubuntu:focal as oai-nr-ue @@ -63,13 +61,12 @@ RUN apt-get update && \ WORKDIR /opt/oai-nr-ue/bin COPY --from=nr-ue-build \ /oai-ran/cmake_targets/ran_build/build/nr-uesoftmodem \ - /oai-ran/docker/scripts/entrypoint.sh \ ./ +COPY ./docker/scripts/nr_ue_entrypoint.sh ./entrypoint.sh WORKDIR /opt/oai-nr-ue/etc COPY --from=nr-ue-build \ /oai-ran/ci-scripts/conf_files/nr-ue-sim.conf \ - /oai-ran/docker/etc/nr-ue.nfapi.conf \ ./ COPY --from=nr-ue-build \