From ddaaf46a05789d0b3a26894411d115ea26e7ce4a Mon Sep 17 00:00:00 2001 From: "E. Scott Daniels" Date: Wed, 15 Apr 2020 12:07:55 -0400 Subject: [PATCH] Bump RMR reference in docker file for listener RMR changs are needed, so we now reference 3.7.4 of RMR. Issue-ID: RIC334 Signed-off-by: E. Scott Daniels Change-Id: I8ffa9e059c8a0815ae3e56a76598d9de82d129a7 --- mc-core/Dockerfile | 2 +- mc-core/container_start.sh | 7 +------ sidecars/listener/Dockerfile | 5 +++-- sidecars/listener/Makefile | 25 ++++++++++--------------- 4 files changed, 15 insertions(+), 24 deletions(-) diff --git a/mc-core/Dockerfile b/mc-core/Dockerfile index 748b3f3..96b70a6 100644 --- a/mc-core/Dockerfile +++ b/mc-core/Dockerfile @@ -16,7 +16,7 @@ ARG STAGE_DIR=/mc -FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu18-c-go:4-u18.04-nng AS project-build +FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu18-c-go:7-u18.04 as project-build # Update & installation of linux packages RUN apt-get update -y && \ apt-get install -y curl && \ diff --git a/mc-core/container_start.sh b/mc-core/container_start.sh index bcce8d4..cd515f9 100755 --- a/mc-core/container_start.sh +++ b/mc-core/container_start.sh @@ -49,12 +49,7 @@ then ( cd /playpen - if (( $USE_NNG )) || [[ ! -f bin/mc_listener_si ]] # we really want the si version unless forced - then - bin/mc_listener - else - bin/mc_listener_si - fi + bin/mc_listener ) echo "listener was started" >&2 diff --git a/sidecars/listener/Dockerfile b/sidecars/listener/Dockerfile index a4d0bc1..65bd97a 100644 --- a/sidecars/listener/Dockerfile +++ b/sidecars/listener/Dockerfile @@ -41,14 +41,15 @@ # Author: E. Scott Daniels -FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu18-c-go:4-u18.04-nng as buildenv +FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu18-c-go:7-u18.04 as buildenv + RUN mkdir /playpen 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=3.6.5 +ARG RMR_VER=3.7.4 RUN wget -nv --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr_${RMR_VER}_amd64.deb/download.deb RUN wget -nv --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_${RMR_VER}_amd64.deb/download.deb diff --git a/sidecars/listener/Makefile b/sidecars/listener/Makefile index 9c1bb8a..2490ffc 100644 --- a/sidecars/listener/Makefile +++ b/sidecars/listener/Makefile @@ -20,9 +20,11 @@ # this make file assuems that both NNG and RMR are installed and that the variables # LD_LIBRARY_PATH, LIBRARY_PATH are set correctly. -binaries = mc_listener mc_listener_si +# with the latest builder support for NNG was dropped, so we must build only SI95 +# based applications; the _si suffix has been dropped +binaries = mc_listener adjuncts = rdc_replay rdc_extract -testers = sender pipe_reader sender_si +testers = sender pipe_reader sender test_progs = sender unit_test pipe_reader lib_obj = mcl.o rdc.o @@ -37,33 +39,26 @@ libmcl.a:: $(lib_obj) $(lib_h) ar -v -r libmcl.a $(lib_obj) mc_listener: mc_listener.c libmcl.a - gcc mc_listener.c -o mc_listener -L. -lmcl -lrmr_nng -lnng -lm -lpthread - -mc_listener_si: mc_listener.c libmcl.a - gcc mc_listener.c -o mc_listener_si -L. -lmcl -lrmr_si -lm -lpthread - + gcc mc_listener.c -o mc_listener -L. -lmcl -lrmr_si -lm -lpthread # ---- testing stuff ----------------------------------------------------------------- tests: $(test_progs) sender : sender.c - gcc sender.c -o sender -lrmr_nng -lnng -lm -lpthread - -sender_si : sender.c - gcc sender.c -o sender_si -lrmr_si -lm -lpthread + gcc sender.c -o sender -lrmr_si -lm -lpthread pipe_reader : pipe_reader.c libmcl.a - gcc pipe_reader.c -o pipe_reader -L. -lmcl -lrmr_nng -lnng -lm -lpthread + gcc pipe_reader.c -o pipe_reader -L. -lmcl -lrmr_si -lm -lpthread unit_test: unit_test.c mcl.c - gcc -g $(coverage_opts) unit_test.c -o unit_test -lrmr_nng -lnng -lm -lpthread + gcc -g $(coverage_opts) unit_test.c -o unit_test -lrmr_si -lm -lpthread # ---- adjunct tools ----------------------------------------------------------------- rdc_replay: rdc_replay.c libmcl.a - gcc rdc_replay.c -o rdc_replay -L. -lmcl -lrmr_nng -lnng -lpthread -lm + gcc rdc_replay.c -o rdc_replay -L. -lmcl -lrmr_si -lpthread -lm rdc_extract: rdc_extract.c libmcl.a - gcc rdc_extract.c -o rdc_extract -L. -lmcl -lrmr_nng -lnng -lpthread -lm + gcc rdc_extract.c -o rdc_extract -L. -lmcl -lrmr_si -lpthread -lm # ---- housekeeping stuff ------------------------------------------------------------- # remove only intermediates -- 2.16.6