X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=RIC-E2-TERMINATION%2FDockerfile;h=57b9aea3f8ff196a781cb805548618f20242da60;hb=refs%2Fchanges%2F83%2F2283%2F1;hp=5604fcb764a9b9b0d4ac26823ced98a645a0821b;hpb=3bac2da3306cb753f967ce41dad1e7719380c916;p=ric-plt%2Fe2.git diff --git a/RIC-E2-TERMINATION/Dockerfile b/RIC-E2-TERMINATION/Dockerfile index 5604fcb..57b9aea 100644 --- a/RIC-E2-TERMINATION/Dockerfile +++ b/RIC-E2-TERMINATION/Dockerfile @@ -47,14 +47,16 @@ RUN apt-get install -y autoconf gawk libtool automake pkg-config autoconf-archiv && 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 && git clone https://github.com/oktal/pistache.git\ - && cd pistache && 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 \ @@ -86,9 +88,9 @@ 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/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