From: Tommy Carpenter <tc677g@att.com>
Date: Mon, 9 Mar 2020 13:29:13 +0000 (-0400)
Subject: Minor fix: use 1.13.1 in Unit test contaiuner.
X-Git-Tag: 2.1.5~1
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=4014a85d3cc546bf39ffa64c5cfe6e21944d2afb;p=ric-plt%2Fa1.git

Minor fix: use 1.13.1 in Unit test contaiuner.

Change-Id: I8e2265f9eb35fa7d1e746cdc270f1abe3f4f8c77
Signed-off-by: Tommy Carpenter <tc677g@att.com>
---

diff --git a/Dockerfile-Unit-Test b/Dockerfile-Unit-Test
index dbb5401..b71302a 100644
--- a/Dockerfile-Unit-Test
+++ b/Dockerfile-Unit-Test
@@ -1,6 +1,6 @@
 # ==================================================================================
-#       Copyright (c) 2019 Nokia
-#       Copyright (c) 2018-2019 AT&T Intellectual Property.
+#       Copyright (c) 2019-2020 Nokia
+#       Copyright (c) 2018-2020 AT&T Intellectual Property.
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
@@ -14,17 +14,12 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 # ==================================================================================
-# install a well known working rmr
 FROM python:3.7-alpine
-RUN apk update && apk add autoconf automake build-base cmake libtool ninja pkgconfig git
-RUN git clone --branch 1.10.2 https://gerrit.o-ran-sc.org/r/ric-plt/lib/rmr \
-    && cd rmr \
-    && mkdir build \
-    && cd build \
-    && cmake .. -DPACK_EXTERNALS=1 \
-    && make install
 
-FROM python:3.7-alpine
+# copy rmr .sos from the builder image
+COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3-go:1-rmr1.13.1 /usr/local/lib64/libnng.so /usr/local/lib64/libnng.so
+COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3-go:1-rmr1.13.1 /usr/local/lib64/librmr_nng.so /usr/local/lib64/librmr_nng.so
+
 
 # dir that rmr routing file temp goes into
 RUN mkdir -p /opt/route/
@@ -36,8 +31,6 @@ RUN apk add gcc musl-dev
 RUN pip install --upgrade pip && pip install tox gevent
 
 # copies
-COPY --from=0 /usr/local/lib64/libnng.so /usr/local/lib64/libnng.so
-COPY --from=0 /usr/local/lib64/librmr_nng.so /usr/local/lib64/librmr_nng.so
 COPY a1/ /tmp/a1
 COPY tests/ /tmp/tests
 COPY setup.py tox.ini /tmp/
diff --git a/docs/developer-guide.rst b/docs/developer-guide.rst
index 3e11e19..b458b1f 100644
--- a/docs/developer-guide.rst
+++ b/docs/developer-guide.rst
@@ -36,7 +36,7 @@ This project follows semver. When changes are made, the versions are in:
 
 Version bumping rmr
 -------------------
-As of 2020/02/13, A1 and all three integration test receivers use a base image from o-ran-sc.
+As of 2020/02/13, A1, Dockerfile-Unit-Test,  and all three integration test receivers use a base image from o-ran-sc.
 The rmr version is in that base image.
 However, the one item in this repo that must be kept in sync is ``rmr-version.yaml``. This controls what rmr gets installed for unit testing.