X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=mc-core%2FDockerfile;h=5bc85778d4d1fcd23d407aa0369be76cbcef68a1;hb=HEAD;hp=b5f220d4604f6f4d63a1f4ebde5219ac7e419159;hpb=1634fd9603ab6184f7d90ad6be6ec8a8707288ea;p=ric-app%2Fmc.git

diff --git a/mc-core/Dockerfile b/mc-core/Dockerfile
index b5f220d..5bc8577 100644
--- a/mc-core/Dockerfile
+++ b/mc-core/Dockerfile
@@ -16,14 +16,16 @@
 
 ARG STAGE_DIR=/mc
 
-FROM nexus3.o-ran-sc.org:10004/o-ran-sc/bldr-ubuntu18-c-go:8-u18.04 AS project-build
+# builders are now in release (10002)
+FROM nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-ubuntu18-c-go:1.9.0 AS project-build
 
 ARG STAGE_DIR
 
-ARG RMR_VER=4.0.5
-
-RUN wget -nv --content-disposition https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/rmr_${RMR_VER}_amd64.deb/download.deb
-RUN wget -nv --content-disposition https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/rmr-dev_${RMR_VER}_amd64.deb/download.deb
+ARG RMR_VER=4.7.4
+ARG RMR_PC_REPO=release
+#ARG RMR_PC_REPO=staging
+RUN wget -nv --content-disposition https://packagecloud.io/o-ran-sc/${RMR_PC_REPO}/packages/debian/stretch/rmr_${RMR_VER}_amd64.deb/download.deb
+RUN wget -nv --content-disposition https://packagecloud.io/o-ran-sc/${RMR_PC_REPO}/packages/debian/stretch/rmr-dev_${RMR_VER}_amd64.deb/download.deb
 RUN dpkg -i rmr_${RMR_VER}_amd64.deb
 RUN dpkg -i rmr-dev_${RMR_VER}_amd64.deb
 RUN ldconfig
@@ -49,6 +51,10 @@ RUN make clean
 RUN make
 RUN make install
 RUN ldconfig
+
+# hack to get protobufs to build
+RUN cp src/google/protobuf/stubs/int128.h /usr/local/include/google/protobuf/stubs
+
 WORKDIR ${STAGE_DIR}
 RUN git clone https://github.com/protobuf-c/protobuf-c.git
 WORKDIR protobuf-c
@@ -76,7 +82,12 @@ RUN python generate_runall.py
 
 
 # now install the binaries and libraries into smaller docker image
-FROM nexus3.o-ran-sc.org:10002/o-ran-sc/ric-app-mc-listener:1.6.0
+FROM nexus3.o-ran-sc.org:10002/o-ran-sc/ric-app-mc-listener:1.12.0
+
+# keep this close to the top to prevent lengthy rebuilds during testing
+RUN apt-get update && \
+    apt-get install -y curl python python-pip libboost-all-dev libhiredis-dev && \
+    apt-get clean
 
 ARG STAGE_DIR
 
@@ -92,10 +103,7 @@ WORKDIR /opt/ric/config
 COPY --from=project-build ${STAGE_DIR}/mc_deployment.json /opt/ric/config/config-file.json
 
 COPY container_start.sh /playpen/bin/
-
-RUN apt-get update && \
-    apt-get install -y curl python python-pip libboost-all-dev libhiredis-dev && \
-    apt-get clean
+COPY package/*.py package/*.sh /playpen/bin/
 
 RUN ldconfig
 RUN pip install protobuf
@@ -105,4 +113,3 @@ WORKDIR /playpen
 ENV GSLITE_ROOT /mc/gs-lite
 
 CMD ["/playpen/bin/container_start.sh"]
-# CMD ["/bin/bash"]