X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=Dockerfile-Unit-Test;h=afbd61a426c5151b82225f753ee32a34da7ed32e;hb=refs%2Fheads%2Fe-release;hp=b5d524cdf9e7150d9ecf781b8bf705ee9035d6ff;hpb=0a3f67614eed2f39b3caaadfeaf6375ecf11172d;p=ric-plt%2Fa1.git

diff --git a/Dockerfile-Unit-Test b/Dockerfile-Unit-Test
index b5d524c..afbd61a 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,34 +14,22 @@
 #   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.1 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.8-alpine
 
-FROM python:3.7-alpine
-
-# dir that rmr routing file temp goes into
-RUN mkdir -p /opt/route/
-
-# Gevent needs gcc
-RUN apk add gcc musl-dev
+# Gevent needs gcc, make, file, ffi
+RUN apk update && apk add gcc musl-dev make file libffi-dev
 
 # Upgrade pip, install tox (gevent is installed as a speed hack in local dev where tox is run many times)
 RUN pip install --upgrade pip && pip install tox gevent
 
+# copy rmr libraries from builder image in lieu of an Alpine package
+COPY --from=nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-alpine3-rmr:4.0.5 /usr/local/lib64/librmr* /usr/local/lib64/
+
 # 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 setup.py tox.ini /tmp/
 COPY a1/ /tmp/a1
 COPY tests/ /tmp/tests
-COPY setup.py tox.ini /tmp/
 WORKDIR /tmp
 
-# Run the unit tests
-RUN tox -e py37, flake8
+# Run the unit tests but skip doc
+RUN tox -e code,flake8