Remove targets/bin/

This commit is contained in:
Robert Schmidt
2022-09-29 10:03:28 +02:00
parent c863e37bd3
commit 6160ab14be
27 changed files with 108 additions and 217 deletions
+2 -2
View File
@@ -57,7 +57,7 @@ RUN yum update -y && \
WORKDIR /opt/oai-enb/bin
COPY --from=enb-build \
/oai-ran/targets/bin/lte-softmodem.Rel15 \
/oai-ran/cmake_targets/ran_build/build/lte-softmodem \
/oai-ran/docker/scripts/entrypoint.sh \
./
@@ -119,4 +119,4 @@ WORKDIR /opt/oai-enb
EXPOSE 2152/udp 36412/udp 36422/udp
ENTRYPOINT ["/opt/oai-enb/bin/entrypoint.sh"]
CMD ["/opt/oai-enb/bin/lte-softmodem.Rel15", "-O", "/opt/oai-enb/etc/enb.conf"]
CMD ["/opt/oai-enb/bin/lte-softmodem", "-O", "/opt/oai-enb/etc/enb.conf"]
+2 -2
View File
@@ -64,7 +64,7 @@ RUN apt-get update && \
WORKDIR /opt/oai-enb/bin
COPY --from=enb-build \
/oai-ran/targets/bin/lte-softmodem.Rel15 \
/oai-ran/cmake_targets/ran_build/build/lte-softmodem \
/oai-ran/docker/scripts/entrypoint.sh \
./
@@ -115,4 +115,4 @@ EXPOSE 2152/udp 36412/udp 36422/udp
#EXPOSE 50001/udp # IF5 / ECPRI (data)
ENTRYPOINT ["/opt/oai-enb/bin/entrypoint.sh"]
CMD ["/opt/oai-enb/bin/lte-softmodem.Rel15", "-O", "/opt/oai-enb/etc/enb.conf"]
CMD ["/opt/oai-enb/bin/lte-softmodem", "-O", "/opt/oai-enb/etc/enb.conf"]
+2 -2
View File
@@ -59,7 +59,7 @@ RUN yum repolist --disablerepo=* && \
WORKDIR /opt/oai-gnb/bin
COPY --from=gnb-build \
/oai-ran/targets/bin/nr-softmodem.Rel15 \
/oai-ran/cmake_targets/ran_build/build/nr-softmodem \
/oai-ran/docker/scripts/entrypoint.sh \
./
@@ -124,4 +124,4 @@ WORKDIR /opt/oai-gnb
#EXPOSE 50001/udp # IF5 / ECPRI (data)
ENTRYPOINT ["/opt/oai-gnb/bin/entrypoint.sh"]
CMD ["/opt/oai-gnb/bin/nr-softmodem.Rel15", "-O", "/opt/oai-gnb/etc/gnb.conf"]
CMD ["/opt/oai-gnb/bin/nr-softmodem", "-O", "/opt/oai-gnb/etc/gnb.conf"]
+2 -2
View File
@@ -63,7 +63,7 @@ RUN apt-get update && \
WORKDIR /opt/oai-gnb/bin
COPY --from=gnb-build \
/oai-ran/targets/bin/nr-softmodem.Rel15 \
/oai-ran/cmake_targets/ran_build/build/nr-softmodem \
/oai-ran/docker/scripts/entrypoint.sh \
./
@@ -114,4 +114,4 @@ WORKDIR /opt/oai-gnb
#EXPOSE 50001/udp # IF5 / ECPRI (data)
ENTRYPOINT ["/opt/oai-gnb/bin/entrypoint.sh"]
CMD ["/opt/oai-gnb/bin/nr-softmodem.Rel15", "-O", "/opt/oai-gnb/etc/gnb.conf"]
CMD ["/opt/oai-gnb/bin/nr-softmodem", "-O", "/opt/oai-gnb/etc/gnb.conf"]
+2 -2
View File
@@ -54,7 +54,7 @@ RUN yum update -y && \
WORKDIR /opt/oai-lte-ru/bin
COPY --from=ru-build \
/oai-ran/targets/bin/oairu.Rel15 \
/oai-ran/cmake_targets/ran_build/build/oairu \
/oai-ran/docker/scripts/entrypoint.sh \
.
@@ -102,4 +102,4 @@ COPY --from=ru-build /oai-ran/docker/etc/rru* ./
WORKDIR /opt/oai-lte-ru
ENTRYPOINT ["/opt/oai-lte-ru/bin/entrypoint.sh"]
CMD ["/opt/oai-lte-ru/bin/oairu.Rel15", "-O", "/opt/oai-lte-ru/etc/rru.conf"]
CMD ["/opt/oai-lte-ru/bin/oairu", "-O", "/opt/oai-lte-ru/etc/rru.conf"]
+2 -2
View File
@@ -59,7 +59,7 @@ RUN apt-get update && \
WORKDIR /opt/oai-lte-ru/bin
COPY --from=ru-build \
/oai-ran/targets/bin/oairu.Rel15 \
/oai-ran/cmake_targets/ran_build/build/oairu \
/oai-ran/docker/scripts/entrypoint.sh \
./
@@ -95,4 +95,4 @@ COPY --from=ru-build /oai-ran/docker/etc/rru* ./
WORKDIR /opt/oai-lte-ru
ENTRYPOINT ["/opt/oai-lte-ru/bin/entrypoint.sh"]
CMD ["/opt/oai-lte-ru/bin/oairu.Rel15", "-O", "/opt/oai-lte-ru/etc/rru.conf"]
CMD ["/opt/oai-lte-ru/bin/oairu", "-O", "/opt/oai-lte-ru/etc/rru.conf"]
+5 -5
View File
@@ -58,11 +58,11 @@ RUN yum update -y && \
WORKDIR /opt/oai-lte-ue/bin
COPY --from=lte-ue-build \
/oai-ran/targets/bin/lte-uesoftmodem.Rel15 \
/oai-ran/cmake_targets/ran_build/build/lte-uesoftmodem \
/oai-ran/docker/scripts/entrypoint.sh \
/oai-ran/targets/bin/conf2uedata \
/oai-ran/targets/bin/nvram \
/oai-ran/targets/bin/usim \
/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 --from=lte-ue-build \
@@ -114,5 +114,5 @@ 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.Rel15"]
CMD ["/opt/oai-lte-ue/bin/lte-uesoftmodem"]
ENTRYPOINT ["/opt/oai-lte-ue/bin/entrypoint.sh"]
+5 -5
View File
@@ -64,11 +64,11 @@ RUN apt-get update && \
WORKDIR /opt/oai-lte-ue/bin
COPY --from=lte-ue-build \
/oai-ran/targets/bin/lte-uesoftmodem.Rel15 \
/oai-ran/cmake_targets/ran_build/build/lte-uesoftmodem \
/oai-ran/docker/scripts/entrypoint.sh \
/oai-ran/targets/bin/conf2uedata \
/oai-ran/targets/bin/nvram \
/oai-ran/targets/bin/usim \
/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 --from=lte-ue-build \
@@ -108,5 +108,5 @@ 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.Rel15"]
CMD ["/opt/oai-lte-ue/bin/lte-uesoftmodem"]
ENTRYPOINT ["/opt/oai-lte-ue/bin/entrypoint.sh"]
+2 -2
View File
@@ -59,7 +59,7 @@ RUN yum update -y && \
WORKDIR /opt/oai-nr-ue/bin
COPY --from=nr-ue-build \
/oai-ran/targets/bin/nr-uesoftmodem.Rel15 \
/oai-ran/cmake_targets/ran_build/build/nr-uesoftmodem \
/oai-ran/docker/scripts/entrypoint.sh \
./
@@ -123,5 +123,5 @@ 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.Rel15", "-O", "/opt/oai-nr-ue/etc/nr-ue.conf"]
CMD ["/opt/oai-nr-ue/bin/nr-uesoftmodem", "-O", "/opt/oai-nr-ue/etc/nr-ue.conf"]
ENTRYPOINT ["/opt/oai-nr-ue/bin/entrypoint.sh"]
+2 -2
View File
@@ -64,7 +64,7 @@ RUN apt-get update && \
WORKDIR /opt/oai-nr-ue/bin
COPY --from=nr-ue-build \
/oai-ran/targets/bin/nr-uesoftmodem.Rel15 \
/oai-ran/cmake_targets/ran_build/build/nr-uesoftmodem \
/oai-ran/docker/scripts/entrypoint.sh \
./
@@ -111,5 +111,5 @@ RUN /bin/bash -c "ln -s /usr/local/lib/liboai_usrpdevif.so /usr/local/lib/liboai
ldconfig
WORKDIR /opt/oai-nr-ue
CMD ["/opt/oai-nr-ue/bin/nr-uesoftmodem.Rel15", "-O", "/opt/oai-nr-ue/etc/nr-ue.conf"]
CMD ["/opt/oai-nr-ue/bin/nr-uesoftmodem", "-O", "/opt/oai-nr-ue/etc/nr-ue.conf"]
ENTRYPOINT ["/opt/oai-nr-ue/bin/entrypoint.sh"]
+14 -14
View File
@@ -60,24 +60,24 @@ RUN yum update -y && \
echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \
echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local-lib.conf
WORKDIR /opt/oai-physim/targets/bin
WORKDIR /opt/oai-physim/bin
COPY --from=phy-sim-build \
/oai-ran/targets/bin/dlsim.Rel15 \
/oai-ran/targets/bin/nr_dlsim.Rel15 \
/oai-ran/targets/bin/nr_prachsim.Rel15 \
/oai-ran/targets/bin/nr_ulschsim.Rel15 \
/oai-ran/targets/bin/polartest.Rel15 \
/oai-ran/targets/bin/ulsim.Rel15 \
/oai-ran/targets/bin/ldpctest.Rel15 \
/oai-ran/targets/bin/nr_dlschsim.Rel15 \
/oai-ran/targets/bin/nr_pbchsim.Rel15 \
/oai-ran/targets/bin/nr_pucchsim.Rel15 \
/oai-ran/targets/bin/nr_ulsim.Rel15 \
/oai-ran/targets/bin/smallblocktest.Rel15 \
/oai-ran/cmake_targets/ran_build/build/dlsim \
/oai-ran/cmake_targets/ran_build/build/nr_dlsim \
/oai-ran/cmake_targets/ran_build/build/nr_prachsim \
/oai-ran/cmake_targets/ran_build/build/nr_ulschsim \
/oai-ran/cmake_targets/ran_build/build/polartest \
/oai-ran/cmake_targets/ran_build/build/ulsim \
/oai-ran/cmake_targets/ran_build/build/ldpctest \
/oai-ran/cmake_targets/ran_build/build/nr_dlschsim \
/oai-ran/cmake_targets/ran_build/build/nr_pbchsim \
/oai-ran/cmake_targets/ran_build/build/nr_pucchsim \
/oai-ran/cmake_targets/ran_build/build/nr_ulsim \
/oai-ran/cmake_targets/ran_build/build/smallblocktest \
./
COPY --from=phy-sim-build \
/oai-ran/targets/bin/libcoding.so \
/oai-ran/cmake_targets/ran_build/build/libcoding.so \
/lib64/liblapacke.so.3 \
/lib64/libX11.so.6 \
/lib64/libXpm.so.4 \
+2 -2
View File
@@ -46,8 +46,8 @@ For all platforms, the strategy for building docker/podman images is the same:
- lte-UE
- nr-UE
* These target images will only contain:
- the generated executable (for example `lte-softmodem.Rel15`)
- the generated shared libraries (for example `liboai_usrpdevif.so.Rel15`)
- the generated executable (for example `lte-softmodem`)
- the generated shared libraries (for example `liboai_usrpdevif.so`)
- the needed libraries and packages to run these generated binaries
- Some configuration file templates
- Some tools (such as `ping`, `ifconfig`)