From: vlad shkapenyuk <vshkap@research.att.com>
Date: Tue, 19 May 2020 15:10:52 +0000 (-0400)
Subject: Change RMR version to 4.0.5, start listener in background mode at container startup
X-Git-Tag: 1.6.0^0
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=167fe26eb2c6d3fca6bd0cf93e59ef6309a59585;p=ric-app%2Fmc.git

Change RMR version to 4.0.5, start listener in background mode at container startup

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

diff --git a/mc-core/Dockerfile b/mc-core/Dockerfile
index 70c178e..1df54c1 100644
--- a/mc-core/Dockerfile
+++ b/mc-core/Dockerfile
@@ -16,14 +16,14 @@
 
 ARG STAGE_DIR=/mc
 
-FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu18-c-go:7-u18.04 AS project-build
+FROM nexus3.o-ran-sc.org:10004/o-ran-sc/bldr-ubuntu18-c-go:8-u18.04 AS project-build
 
 ARG STAGE_DIR
 
-ARG RMR_VER=3.7.4
+ARG RMR_VER=4.0.5
 
-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
+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 dpkg -i rmr_${RMR_VER}_amd64.deb
 RUN dpkg -i rmr-dev_${RMR_VER}_amd64.deb
 RUN ldconfig
diff --git a/mc-core/container_start.sh b/mc-core/container_start.sh
index 4e949eb..b241ecd 100755
--- a/mc-core/container_start.sh
+++ b/mc-core/container_start.sh
@@ -60,7 +60,7 @@ then
 	else
 		bin/mc_listener
 	fi
-)
+) >/tmp/listener.std 2>&1 &
 
 echo "listener was started" >&2
 
diff --git a/sidecars/listener/Dockerfile b/sidecars/listener/Dockerfile
index 65bd97a..b9cb9c1 100644
--- a/sidecars/listener/Dockerfile
+++ b/sidecars/listener/Dockerfile
@@ -41,7 +41,7 @@
 #	Author:		E. Scott Daniels
 
 
-FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu18-c-go:7-u18.04 as buildenv
+FROM nexus3.o-ran-sc.org:10004/o-ran-sc/bldr-ubuntu18-c-go:8-u18.04 as buildenv
 
 RUN mkdir /playpen
 
@@ -49,10 +49,10 @@ 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.7.4
+ARG RMR_VER=4.0.5
 
-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
+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 dpkg -i rmr_${RMR_VER}_amd64.deb
 RUN dpkg -i rmr-dev_${RMR_VER}_amd64.deb
 
diff --git a/sidecars/listener/container-tag.yaml b/sidecars/listener/container-tag.yaml
index 7c0856a..db0f276 100644
--- a/sidecars/listener/container-tag.yaml
+++ b/sidecars/listener/container-tag.yaml
@@ -1,4 +1,4 @@
 ---
-tag: '1.5.0'
+tag: '1.6.0'
 
 # this is used by CI jobs to apply a tag when it builds the image