From: aa7133@att.com Date: Tue, 21 Jan 2020 07:10:19 +0000 (+0200) Subject: remove pistache from build X-Git-Tag: 5.4.8~97 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=79bd3741b4b3ce223485a9f5ef775a071b0078e0;p=ric-plt%2Fe2.git remove pistache from build Change-Id: I78dd87833d4e5eb34bdabce8d2804c5e3d49769a Signed-off-by: aa7133@att.com --- diff --git a/RIC-E2-TERMINATION/Dockerfile b/RIC-E2-TERMINATION/Dockerfile index c218c86..3b252df 100644 --- a/RIC-E2-TERMINATION/Dockerfile +++ b/RIC-E2-TERMINATION/Dockerfile @@ -48,7 +48,7 @@ RUN apt-get install -y autoconf gawk libtool automake pkg-config autoconf-archiv && 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 \ + && wget --content-dispositihttps://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 @@ -88,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