From 852ee5ee6f5a278a1572c8f7d2648f838152fb48 Mon Sep 17 00:00:00 2001 From: "aa7133@att.com" Date: Tue, 21 Apr 2020 17:20:24 +0300 Subject: [PATCH] version 4.0.9 remove mmg libraries from docker file Change-Id: I513e285b62bfce39c7554b7f71fa6b8b7fcc05d7 Signed-off-by: aa7133@att.com --- RIC-E2-TERMINATION/Dockerfile | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/RIC-E2-TERMINATION/Dockerfile b/RIC-E2-TERMINATION/Dockerfile index b46d77a..c7f4201 100644 --- a/RIC-E2-TERMINATION/Dockerfile +++ b/RIC-E2-TERMINATION/Dockerfile @@ -20,7 +20,7 @@ # This source code is part of the near-RT RIC (RAN Intelligent Controller) # platform project (RICP). # -FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu18-c-go:5-u18.04-nng as ubuntu +FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu18-c-go:7-u18.04 as ubuntu #FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu16-c-go:3-u16.04-nng as ubuntu WORKDIR /opt/e2/ @@ -39,10 +39,10 @@ RUN cat /opt/e2/RIC-E2-TERMINATION/config/config.conf RUN wget --content-disposition https://github.com/cgreen-devs/cgreen/releases/download/1.2.0/cgreen_1.2.0_amd64.deb \ && dpkg -i cgreen_1.2.0_amd64.deb \ - && wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr_3.0.2_amd64.deb/download.deb \ - && dpkg -i rmr_3.0.2_amd64.deb \ - && wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_3.0.2_amd64.deb/download.deb \ - && dpkg -i rmr-dev_3.0.2_amd64.deb + && wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr_3.8.2_amd64.deb/download.deb \ + && dpkg -i rmr_3.8.2_amd64.deb \ + && wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_3.8.2_amd64.deb/download.deb \ + && dpkg -i rmr-dev_3.8.2_amd64.deb RUN apt-get install -y libcurl4-gnutls-dev gawk libtbb-dev libtbb-doc libtbb2 libtbb2-dbg \ && cd /opt/e2/RIC-E2-TERMINATION/3rdparty && git clone https://github.com/oktal/pistache.git && cd pistache \ @@ -86,18 +86,18 @@ COPY --from=ubuntu /opt/e2/RIC-E2-TERMINATION/startup.sh /opt/e2/startup.sh #COPY --from=ubuntu /opt/e2/RIC-E2-TERMINATION/tracelibcpp/build/libtracelibcpp.so /usr/local/lib/libtracelibcpp.so #COPY --from=ubuntu /opt/e2/RIC-E2-TERMINATION/tracelibcpp/build/libtracelibcpp.so.0 /usr/local/lib/libtracelibcpp.so.0 #COPY --from=ubuntu /opt/e2/RIC-E2-TERMINATION/tracelibcpp/build/libtracelibcpp.so.0.0.2 /usr/local/lib/libtracelibcpp.so.0.0.2 -#COPY --from=ubuntu /usr/local/lib/librmr_nng.a /usr/local/lib/librmr_nng.a -COPY --from=ubuntu /usr/local/lib/libnng.so /usr/local/lib/libnng.so -COPY --from=ubuntu /usr/local/lib/libnng.so.1 /usr/local/lib/libnng.so.1 -COPY --from=ubuntu /usr/local/lib/libnng.so.1.1.0 /usr/local/lib/libnng.so.1.1.0 +#COPY --from=ubuntu /usr/local/lib/libnng.so /usr/local/lib/libnng.so +#COPY --from=ubuntu /usr/local/lib/libnng.so.1 /usr/local/lib/libnng.so.1 +#COPY --from=ubuntu /usr/local/lib/libnng.so.1.1.0 /usr/local/lib/libnng.so.1.1.0 # -COPY --from=ubuntu /usr/local/lib/librmr_nng.so.3.0.2 /usr/local/lib/librmr_nng.so.3.0.2 -COPY --from=ubuntu /usr/local/lib/librmr_si.so.3.0.2 /usr/local/lib/librmr_si.so.3.0.2 +#COPY --from=ubuntu /usr/local/lib/librmr_nng.so.3.8.2 /usr/local/lib/librmr_nng.so.3.8.2 + +COPY --from=ubuntu /usr/local/lib/librmr_si.so.3.8.2 /usr/local/lib/librmr_si.so.3.8.2 COPY --from=ubuntu /usr/local/lib/librmr_si.so.3 /usr/local/lib/librmr_si.so.3 COPY --from=ubuntu /usr/local/lib/librmr_si.so /usr/local/lib/librmr_si.so -COPY --from=ubuntu /usr/local/lib/librmr_nng.so.3 /usr/local/lib/librmr_nng.so.3 -COPY --from=ubuntu /usr/local/lib/librmr_nng.so /usr/local/lib/librmr_nng.so +#COPY --from=ubuntu /usr/local/lib/librmr_nng.so.3 /usr/local/lib/librmr_nng.so.3 +#COPY --from=ubuntu /usr/local/lib/librmr_nng.so /usr/local/lib/librmr_nng.so COPY --from=ubuntu /usr/local/lib/libmdclog.so.0 /usr/local/lib/libmdclog.so.0 -- 2.16.6