X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=RIC-E2-TERMINATION%2FDockerfile;h=3040ebeaeb38598ebfb292ab8c9f9062ff45c29d;hb=77fff437e22b0ac00466a486705b8bc24f06224d;hp=d86523ee4420ec2c34ff57e063669be0ae7e9ef6;hpb=2e26814afae07ee5b75b5403c1cb84f1de1e3ef4;p=ric-plt%2Fe2.git diff --git a/RIC-E2-TERMINATION/Dockerfile b/RIC-E2-TERMINATION/Dockerfile index d86523e..3040ebe 100644 --- a/RIC-E2-TERMINATION/Dockerfile +++ b/RIC-E2-TERMINATION/Dockerfile @@ -15,31 +15,49 @@ # limitations under the License. # ############################################################################## + # # This source code is part of the near-RT RIC (RAN Intelligent Controller) # platform project (RICP). # -FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu16-c-go:2-u16.04-nng as ubuntu +FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu16-c-go:3-u16.04-nng as ubuntu WORKDIR /opt/e2/ RUN mkdir -p /opt/e2/RIC-E2-TERMINATION/ \ && mkdir -p /opt/e2/RIC-E2-TERMINATION/TEST/T1 \ - && mkdir -p /opt/e2/RIC-E2-TERMINATION/TEST/T2 + && mkdir -p /opt/e2/RIC-E2-TERMINATION/TEST/T2 \ + && 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 wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr_1.10.0_amd64.deb/download.deb -RUN dpkg -i rmr_1.10.0_amd64.deb -RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_1.10.0_amd64.deb/download.deb -RUN dpkg -i rmr-dev_1.10.0_amd64.deb +RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr_1.13.0_amd64.deb/download.deb +RUN dpkg -i rmr_1.13.0_amd64.deb +RUN wget --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_1.13.0_amd64.deb/download.deb +RUN dpkg -i rmr-dev_1.13.0_amd64.deb + +ARG BUILD_TYPE=Release RUN apt-get install -y autoconf gawk libtool automake pkg-config autoconf-archive \ && git clone http://gerrit.o-ran-sc.org/r/com/log \ - && cd log \ - && ./autogen.sh && ./configure && make && make install && ldconfig \ - && cd /opt/e2/ && /usr/local/bin/cmake . && make + && cd log && ./autogen.sh && ./configure && make && 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 \ + && 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 \ + && 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 + +# && 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 .. && make install && ldconfig\ + + +RUN if [$BUILD_TYPE == "Debug"] ; then make e2_coverage ; fi # && git clone http://gerrit.o-ran-sc.org/r/ric-plt/tracelibcpp \ # && cd tracelibcpp && mkdir build && cd build \ @@ -52,23 +70,30 @@ RUN apt-get install -y autoconf gawk libtool automake pkg-config autoconf-archiv # && find / -type f -name "libopentracing.a" -exec cp {} libopentracing.a \; && cd /opt/e2/RIC-E2-TERMINATION && ls nlohmann \ FROM ubuntu:16.04 -RUN apt-get update && apt-get install -y net-tools iputils-ping curl tcpdump +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/RIC-E2-TERMINATION/dockerRouter.txt /opt/e2/dockerRouter.txt +COPY --from=ubuntu /opt/e2/RIC-E2-TERMINATION/config/config.conf /opt/e2/config/config.conf +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/librmr_nng.so.1 /usr/local/lib/librmr_nng.so.1 COPY --from=ubuntu /usr/local/lib/librmr_nng.so /usr/local/lib/librmr_nng.so -COPY --from=ubuntu /usr/local/lib/librmr_nng.so.1.10.0 /usr/local/lib/librmr_nng.so.1.10.0 +COPY --from=ubuntu /usr/local/lib/librmr_nng.so.1.13.0 /usr/local/lib/librmr_nng.so.1.13.0 COPY --from=ubuntu /usr/local/lib/libnng.so.1 /usr/local/lib/libnng.so.1 COPY --from=ubuntu /usr/local/lib/libmdclog.so.0 /usr/local/lib/libmdclog.so.0 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 +#COPY --from=ubuntu /usr/local/lib/libpistache.so /usr/local/lib/libpistache.so +#COPY --from=ubuntu /usr/local/lib/libpistache.so.0 /usr/local/lib/libpistache.so.0 +#COPY --from=ubuntu /usr/local/lib/libpistache.so.0.0.001-git20191031 /usr/local/lib/libpistache.so.0.0.001-git20191031 + + COPY --from=ubuntu /usr/lib/libboost_log.so /usr/lib/libboost_log.so COPY --from=ubuntu /usr/lib/libboost_log.so.1.69.0 /usr/lib/libboost_log.so.1.69.0 @@ -97,8 +122,6 @@ COPY --from=ubuntu /usr/lib/x86_64-linux-gnu/libicudata.so.55.1 /usr/lib/x86_64- WORKDIR /opt/e2/ ENV LD_LIBRARY_PATH=/usr/local/lib ENV RMR_SEED_RT=dockerRouter.txt -ENV nano=38000 -ENV loglevel=info -ENV volume="." +RUN chmod +x /opt/e2/startup.sh EXPOSE 38000 -CMD ["sh", "-c", "./e2 nano $nano loglevel $loglevel volume $volume"] +CMD ["sh", "-c", "./startup.sh"]