X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=mc-core%2FDockerfile;h=56b4765d8fbd1ae88627c7c6897c38eb65769d2e;hb=3d4b88135c1a1429d8cecb7380cfc2f8c67d04ef;hp=b5f220d4604f6f4d63a1f4ebde5219ac7e419159;hpb=1634fd9603ab6184f7d90ad6be6ec8a8707288ea;p=ric-app%2Fmc.git diff --git a/mc-core/Dockerfile b/mc-core/Dockerfile index b5f220d..56b4765 100644 --- a/mc-core/Dockerfile +++ b/mc-core/Dockerfile @@ -16,11 +16,11 @@ ARG STAGE_DIR=/mc -FROM nexus3.o-ran-sc.org:10004/o-ran-sc/bldr-ubuntu18-c-go:8-u18.04 AS project-build +FROM nexus3.o-ran-sc.org:10004/o-ran-sc/bldr-ubuntu18-c-go:1.9.0 AS project-build ARG STAGE_DIR -ARG RMR_VER=4.0.5 +ARG RMR_VER=4.5.2 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 @@ -76,7 +76,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.7.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 +97,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 +107,3 @@ WORKDIR /playpen ENV GSLITE_ROOT /mc/gs-lite CMD ["/playpen/bin/container_start.sh"] -# CMD ["/bin/bash"]