Bump the RMR version in the listener container to 4.4.6

[ric-app/mc.git] / sidecars / listener / Dockerfile

diff --git a/sidecars/listener/Dockerfile b/sidecars/listener/Dockerfile
index e9a92f7..9d2da6c 100644 (file)
--- a/sidecars/listener/Dockerfile
+++ b/sidecars/listener/Dockerfile
@@ -49,26 +49,28 @@ RUN apt-get update && apt-get install -y cmake gcc make git g++ wget
 
 WORKDIR /playpen
 # Install RMr (runtime and dev) from debian package cached on packagecloud.io
-ARG RMR_VER=4.0.5
+ARG RMR_VER=4.4.6
+ARG RMR_PC_REPO=staging
+#ARG RMR_PC_REPO=release
 
-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
+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 mkdir /playpen/bin /playpen/listener /playpen/listener/test
-ARG SRC=.
-COPY ${SRC}/*.ksh ${SRC}/Makefile ${SRC}/*.h ${SRC}/*.c /playpen/listener/
-COPY ${SRC}/verify_replay.sh ${SRC}/verify.sh /playpen/listener/
+RUN mkdir -p /playpen/bin /playpen/listener/src /playpen/listener/test
+ARG SRC=src
+COPY ${SRC}/*.ksh ${SRC}/Makefile ${SRC}/*.h ${SRC}/*.c /playpen/listener/src/
+COPY ${SRC}/verify_replay.sh ${SRC}/verify.sh /playpen/listener/src/
 
-ARG TEST=${SRC}/test
+ARG TEST=test
 COPY ${TEST}/*.ksh ${TEST}/Makefile ${TEST}/*.h ${TEST}/*.c /playpen/listener/test/
 
 # Build all binaries; verify scripts expect them to be in bin, so we must copy too
 #
 ENV LD_LIBRARY_PATH=/usr/local/lib64:/usr/local/lib
 ENV C_INCLUDE_PATH=/usr/local/include
-RUN     cd /playpen/listener \
+RUN     cd /playpen/listener/src \
        &&  make -B all \
        &&  ls -al mc_listener \
        &&  cp mc_listener sender pipe_reader rdc_replay rdc_extract /playpen/bin/
@@ -76,9 +78,13 @@ RUN     cd /playpen/listener \
 # Run unit tests. If they don't pass the build fails here. Tests can be run from src, but expect binaries in bin
 # so that they can be run in the final image as well.
 #
-ENV PATH /playpen/bin:/playpen/listener:$PATH
-RUN cd /playpen/listener/test/; ./run_unit_test.ksh
-RUN cd /playpen/listener/; /playpen/listener/verify.sh; /playpen/listener/verify_replay.sh
+ENV PATH /playpen/bin:/playpen/listener/src:$PATH
+RUN    cd /playpen/listener/test \
+       && ./run_unit_test.ksh
+
+RUN       cd /playpen/listener/src \
+       && /playpen/listener/src/verify.sh \
+       && /playpen/listener/src/verify_replay.sh
 
 
 # -----  final, smaller image ----------------------------------
@@ -92,13 +98,20 @@ RUN rm -fr /var/lib/apt/lists
 COPY --from=buildenv /playpen/rmr_*.deb /tmp/
 RUN dpkg -i /tmp/rmr_*_amd64.deb
 
-# obtusely this uses the previous value
-ARG SRC
+ARG SRC=src
+ARG PPSRC=/playpen/listener/src
 
 RUN mkdir -p /playpen/bin
+
+# pull from the huge builder image
 COPY --from=buildenv /usr/local/lib/* /usr/local/lib/
-COPY --from=buildenv /playpen/listener/mc_listener /playpen/listener/sender /playpen/listener/pipe_reader /playpen/listener/rdc_replay /playpen/listener/rdc_extract /playpen/bin/
-COPY ${SRC}/verify_replay.sh ${SRC}/verify.sh ${SRC}/run_replay.sh ${SRC}/help /playpen/bin/
+COPY --from=buildenv ${PPSRC}/mc_listener ${PPSRC}/sender ${PPSRC}/pipe_reader ${PPSRC}/rdc_replay ${PPSRC}/rdc_extract /playpen/bin/
+
+# pull from the source
+COPY ${SRC}/verify_replay.sh ${SRC}/verify.sh ${SRC}/run_replay.sh /playpen/bin/
+COPY ${SRC}/help.sh /playpen/bin/help
+
+RUN chmod 755 /playpen/bin/*
 
 ENV PATH=/playpen/bin:$PATH
 ENV LD_LIBRARY_PATH=/usr/local/lib64:/usr/local/lib