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

docker/Dockerfile.nrUE.rhel9

@@ -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/ubi9/ubi:latest as oai-nr-ue
@@ -58,13 +56,11 @@ RUN dnf 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"]