Merge remote-tracking branch 'origin/docker-config-changes' into integration_2023_w23_ci

docker/Dockerfile.lteUE.rhel9

@@ -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/ubi9/ubi:latest as oai-lte-ue
@@ -57,12 +54,12 @@ RUN dnf 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"]