Fix SONAR warnings. Update RMR version and MC listener version

Signed-off-by: vlad shkapenyuk <vshkap@research.att.com>
Change-Id: I622923f5672632917955deef21890dcacecf0d9b

diff --git a/mc-core/Dockerfile b/mc-core/Dockerfile
index 6bd4bf7..5bc8577 100644 (file)
--- a/mc-core/Dockerfile
+++ b/mc-core/Dockerfile
@@ -21,10 +21,11 @@ FROM nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-ubuntu18-c-go:1.9.0 AS project-buil
 
 ARG STAGE_DIR
 
-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
+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
@@ -81,7 +82,7 @@ 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.7.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 && \

diff --git a/mc-core/container-tag.yaml b/mc-core/container-tag.yaml
index 35ff9fb..44a9c62 100644 (file)
--- a/mc-core/container-tag.yaml
+++ b/mc-core/container-tag.yaml
@@ -1,4 +1,4 @@
 ---
-tag: '1.0.10'
+tag: '1.0.11'
 
 # this is used by the CI jobs to tag the image it builds

diff --git a/mc-core/container_start.sh b/mc-core/container_start.sh
index ea3d3a9..2bcc347 100755 (executable)
--- a/mc-core/container_start.sh
+++ b/mc-core/container_start.sh
@@ -44,7 +44,7 @@
 # MUST have a posix style function declaration!
 unreg() {
        trap - EXIT                                             # prevent running this again when we force the exit
-       /playpen/bin/xam_register -U
+       /playpen/bin/xam_register.sh -U
        exit
 }
 

diff --git a/sidecars/listener/src/pipe_reader.c b/sidecars/listener/src/pipe_reader.c
index 501c6c5..0515fc1 100644 (file)
--- a/sidecars/listener/src/pipe_reader.c
+++ b/sidecars/listener/src/pipe_reader.c
@@ -177,6 +177,7 @@ int main( int argc,  char** argv ) {
                        sleep( 1 );
                }
        }
+       free(dname);    // lets keep SONAR happy
 
        fprintf( stderr, "[INFO] max reached: %d\n", max );
 }