X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=mc-core%2FDockerfile;h=8073475c39fe55e3a7dd8d1d25d910030d2f29ad;hb=0eb834e581b25c0ac0a657b1b7d8bb70fe4d2aa9;hp=eebfffd8f91cdcda16b2f67e869514fa127dff8d;hpb=7f09b7d24896c782a3e599ec35f76a42d2abd306;p=ric-app%2Fmc.git

diff --git a/mc-core/Dockerfile b/mc-core/Dockerfile
index eebfffd..8073475 100644
--- a/mc-core/Dockerfile
+++ b/mc-core/Dockerfile
@@ -16,8 +16,7 @@
 
 ARG STAGE_DIR=/mc
 
-FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu16-c-go:3-u16.04-nng AS project-build
-
+FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu18-c-go:4-u18.04-nng AS project-build
 # Update & installation of linux packages
 RUN apt-get update -y && \
         apt-get install -y curl && \
@@ -28,6 +27,15 @@ ARG STAGE_DIR
 
 COPY mc ${STAGE_DIR}
 WORKDIR ${STAGE_DIR}
+RUN apt-get install -y libboost-all-dev
+RUN apt-get install -y libhiredis-dev
+RUN git clone https://gerrit.o-ran-sc.org/r/ric-plt/sdl
+WORKDIR ${STAGE_DIR}/sdl
+RUN ./autogen.sh
+RUN ./configure
+RUN make all
+RUN make install
+WORKDIR ${STAGE_DIR}
 RUN git clone https://github.com/protocolbuffers/protobuf.git
 WORKDIR ${STAGE_DIR}/protobuf
 RUN ./autogen.sh
@@ -47,27 +55,21 @@ RUN make install
 RUN ldconfig
 RUN pip install protobuf
 WORKDIR ${STAGE_DIR}
-RUN git clone -b Amber https://gerrit.o-ran-sc.org/r/com/gs-lite
+RUN git clone -b release/0.1.0 https://gerrit.o-ran-sc.org/r/com/gs-lite
 WORKDIR ${STAGE_DIR}/gs-lite
 COPY mc/cfg ${STAGE_DIR}/gs-lite/cfg
 COPY mc/local_datasource ${STAGE_DIR}/gs-lite/src/lib/gscprts/local_datasource
 COPY mc/local ${STAGE_DIR}/gs-lite/include/lfta/local
 COPY mc/queries ${STAGE_DIR}/gs-lite/demo/queries
+COPY mc/mcnib/* ${STAGE_DIR}/gs-lite/src/tools/
 RUN ./build_and_install.sh
 WORKDIR ${STAGE_DIR}/gs-lite/demo/queries
 ENV GSLITE_ROOT ${STAGE_DIR}/gs-lite
 RUN bash ${STAGE_DIR}/gs-lite/bin/buildit
+RUN python generate_runall.py
 
-# Update & installation of linux packages
-RUN apt-get update -y && \
-        apt-get install -y curl && \
-        apt-get install -y procps && \
-        apt-get install -y python-pip
 
 # now install the binaries and libraries into smaller docker image
-# use the mc_listener container as the base; all of it's stuff is in /playpen and can
-# stay where it is
-#
 FROM nexus3.o-ran-sc.org:10004/o-ran-sc/ric-app-mc-listener:1.3.2
 
 ARG STAGE_DIR
@@ -78,11 +80,13 @@ COPY --from=project-build ${STAGE_DIR}/data_gen /mc/data_gen
 COPY --from=project-build ${STAGE_DIR}/mc_deployment.json /mc/
 COPY --from=project-build ${STAGE_DIR}/extract_params.py /mc/
 COPY --from=project-build /usr/local/lib/libproto* /usr/local/lib/
+COPY --from=project-build /usr/local/lib/libsdl* /usr/local/lib/
 
 COPY container_start.sh /playpen/bin/
 
 RUN apt-get update && \
-    apt-get install -y curl python python-pip && \
+    apt-get install -y curl python python-pip libboost-all-dev libhiredis-dev && \
+# redis-tools && \
     apt-get clean
 
 RUN ldconfig