X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=RIC-E2-TERMINATION%2FDockerfile;h=bbef135e535d8359ca2987bab6dd462a9671589d;hb=refs%2Fchanges%2F26%2F4226%2F1;hp=0d5806f8cc4394065d9eb85f361c92fff3c7eeca;hpb=ecd97947e72d4f1ca1016c8d1b50ede80780a49f;p=ric-plt%2Fe2.git diff --git a/RIC-E2-TERMINATION/Dockerfile b/RIC-E2-TERMINATION/Dockerfile index 0d5806f..bbef135 100644 --- a/RIC-E2-TERMINATION/Dockerfile +++ b/RIC-E2-TERMINATION/Dockerfile @@ -20,8 +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-ubuntu16-c-go:3-u16.04-nng as ubuntu +FROM nexus3.o-ran-sc.org:10004/o-ran-sc/bldr-ubuntu18-c-go:8-u18.04 as ubuntu WORKDIR /opt/e2/ @@ -33,30 +32,30 @@ RUN mkdir -p /opt/e2/RIC-E2-TERMINATION/ \ && mkdir -p /opt/e2/RIC-E2-TERMINATION/3rdparty COPY . /opt/e2/RIC-E2-TERMINATION/ -RUN mv /opt/e2/RIC-E2-TERMINATION/CMakeLists.txt /opt/e2/ -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.6.2_amd64.deb/download.deb \ - && dpkg -i rmr_3.6.2_amd64.deb \ - && wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_3.6.2_amd64.deb/download.deb \ - && dpkg -i rmr-dev_3.6.2_amd64.deb - -RUN apt-get install -y libcurl4-gnutls-dev gawk \ +RUN mv /opt/e2/RIC-E2-TERMINATION/CMakeLists.txt /opt/e2/ && cat /opt/e2/RIC-E2-TERMINATION/config/config.conf \ + && 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/release/packages/debian/stretch/rmr_4.0.2_amd64.deb/download.deb \ + && dpkg -i rmr_4.0.2_amd64.deb \ + && wget --content-disposition https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/rmr-dev_4.0.2_amd64.deb/download.deb \ + && dpkg -i rmr-dev_4.0.2_amd64.deb \ + && wget --content-disposition https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/mdclog_0.0.4-1_amd64.deb/download.deb \ + && dpkg -i mdclog_0.0.4-1_amd64.deb \ + && wget --content-disposition https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/mdclog-dev_0.0.4-1_amd64.deb/download.deb \ + && dpkg -i mdclog-dev_0.0.4-1_amd64.deb \ + && 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 \ && git submodule update --init && mkdir build && cd build \ && cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DPISTACHE_BUILD_DOCS=false \ -DPISTACHE_USE_SSL=false -DPISTACHE_BUILD_TESTS=false -DCMAKE_INSTALL_PREFIX=/usr/local ../ \ && make -j && make install && ldconfig \ - && git clone http://gerrit.o-ran-sc.org/r/com/log \ - && cd log && ./autogen.sh && ./configure && make && make install && ldconfig \ + && cd /opt/e2/RIC-E2-TERMINATION/3rdparty && git clone -v https://github.com/jupp0r/prometheus-cpp.git \ + && cd prometheus-cpp && git submodule init && git submodule update && mkdir build && cd build \ + && cmake .. -DBUILD_SHARED_LIBS=OFF && make -j 4 && make install && ldconfig \ && cd /opt/e2/RIC-E2-TERMINATION/3rdparty && git clone https://github.com/jarro2783/cxxopts.git \ - && cd cxxopts && mkdir build && cd build && cmake .. && make install && ldconfig \ && cd /opt/e2/RIC-E2-TERMINATION/3rdparty && git clone https://github.com/Tencent/rapidjson.git \ - && cd rapidjson && mkdir build && cd build && cmake .. && make install && ldconfig \ - && cd /opt/e2/RIC-E2-TERMINATION/3rdparty \ + && cd /opt/e2/RIC-E2-TERMINATION/3rdparty && git clone https://github.com/zeux/pugixml.git \ && cd /opt/e2/ && git clone https://github.com/bilke/cmake-modules.git \ && cd /opt/e2/ && /usr/local/bin/cmake -D CMAKE_BUILD_TYPE=$BUILD_TYPE . && make \ && echo "3" > /opt/e2/rmr.verbose @@ -76,14 +75,7 @@ RUN if [$BUILD_TYPE == "Debug"] ; then make e2_coverage ; fi # && find / -type f -name "libopentracing.a" -exec cp {} libopentracing.a \; && cd /opt/e2/RIC-E2-TERMINATION && ls nlohmann \ FROM ubuntu:18.04 - -RUN apt-get update && apt-get install -y \ - net-tools \ - iputils-ping \ - curl \ - tcpdump - -RUN mkdir -p /opt/e2/config +RUN apt-get update && apt-get install -y net-tools iputils-ping curl tcpdump && mkdir -p /opt/e2/config COPY --from=ubuntu /opt/e2/e2 /opt/e2/e2 COPY --from=ubuntu /opt/e2/rmr.verbose /tmp/rmr.verbose @@ -93,26 +85,29 @@ 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/librmr_nng.so.3.6.2 /usr/local/lib/librmr_nng.so.3.6.2 -COPY --from=ubuntu /usr/local/lib/librmr_si.so.3.6.2 /usr/local/lib/librmr_si.so.3.6.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_si.so.4.0.2 /usr/local/lib/librmr_si.so.4.0.2 +COPY --from=ubuntu /usr/local/lib/librmr_si.so.4 /usr/local/lib/librmr_si.so.4 +COPY --from=ubuntu /usr/local/lib/librmr_si.so /usr/local/lib/librmr_si.so -COPY --from=ubuntu /usr/local/lib/libmdclog.so.0 /usr/local/lib/libmdclog.so.0 +COPY --from=ubuntu /usr/lib/x86_64-linux-gnu/libmdclog.so /usr/local/lib/libmdclog.so +COPY --from=ubuntu /usr/lib/x86_64-linux-gnu/libmdclog.so.0 /usr/local/lib/libmdclog.so.0 +COPY --from=ubuntu /usr/lib/x86_64-linux-gnu/libmdclog.so.0.0.4 /usr/local/lib/libmdclog.so.0.0.4 COPY --from=ubuntu /usr/lib/x86_64-linux-gnu/libcgreen.so /usr/local/libcgreen.so -COPY --from=ubuntu //usr/lib/x86_64-linux-gnu/libcgreen.so.1 /usr/local/libcgreen.so.1 +COPY --from=ubuntu /usr/lib/x86_64-linux-gnu/libcgreen.so.1 /usr/local/libcgreen.so.1 COPY --from=ubuntu /usr/lib/x86_64-linux-gnu/libcgreen.so.1.2.0 /usr/local/libcgreen.so.1.2.0 +COPY --from=ubuntu /usr/lib/x86_64-linux-gnu/libtbb.so /usr/local/libtbb.so +COPY --from=ubuntu /usr/lib/x86_64-linux-gnu/libtbb.so.2 /usr/local/libtbb.so.2 + +COPY --from=ubuntu /usr/lib/x86_64-linux-gnu/libtbbmalloc.so /usr/local/libtbbmalloc.so +COPY --from=ubuntu /usr/lib/x86_64-linux-gnu/libtbbmalloc.so.2 /usr/local/libtbbmalloc.so.2 + +COPY --from=ubuntu /usr/lib/x86_64-linux-gnu/libtbbmalloc_proxy.so /usr/local/libtbbmalloc_proxy.so +COPY --from=ubuntu /usr/lib/x86_64-linux-gnu/libtbbmalloc_proxy.so.2 /usr/local/libtbbmalloc_proxy.so.2 + COPY --from=ubuntu /usr/lib/libboost_log_setup.so /usr/lib/libboost_log_setup.so COPY --from=ubuntu /usr/lib/libboost_log_setup.so.1.69.0 /usr/lib/libboost_log_setup.so.1.69.0 @@ -147,6 +142,11 @@ COPY --from=ubuntu /usr/lib/x86_64-linux-gnu/libicudata.so.60 /usr/lib/libicudat COPY --from=ubuntu /usr/lib/x86_64-linux-gnu/libstdc++.so.6 /usr/lib/libstdc++.so.6 +COPY --from=ubuntu /usr/lib/x86_64-linux-gnu/libcurl-gnutls.so.4.5.0 /usr/lib/libcurl-gnutls.so.4.5.0 +COPY --from=ubuntu /usr/lib/x86_64-linux-gnu/libcurl-gnutls.so.4 /usr/lib/libcurl-gnutls.so.4 +COPY --from=ubuntu /usr/lib/x86_64-linux-gnu/libcurl-gnutls.so /usr/lib/libcurl-gnutls.so + + WORKDIR /opt/e2/ ENV LD_LIBRARY_PATH=/usr/local/lib ENV RMR_SEED_RT=dockerRouter.txt