X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=Dockerfile-Unit-Test;h=097d4f3864c6ad9c6b89dfa691ae8759eefed6a8;hb=f7ddd997fdcffaff332dfc8aba50a49c9cd1e72c;hp=00b87fa15da33879a8b75d41bf12455c64dbb43a;hpb=40caa314d23122f0bd25c0e66b65d10303538164;p=ric-plt%2Fa1.git

diff --git a/Dockerfile-Unit-Test b/Dockerfile-Unit-Test
index 00b87fa..097d4f3 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,25 @@
 #   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.3.0 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
-
-# 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/
-WORKDIR /tmp
+# copy rmr .so from builder image in lieu of an Alpine package
+COPY --from=nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-alpine3-rmr:3.8.0 /usr/local/lib64/librmr_si.so /usr/local/lib64/librmr_si.so
 
 # dir that rmr routing file temp goes into
 RUN mkdir -p /opt/route/
 
-# Gevent needs gcc; TODO: this will get fixed
+# Gevent needs gcc
 RUN apk add gcc musl-dev
 
-# Upgrade pip, install tox
-RUN pip install --upgrade pip && pip install tox
+# 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
+
+# copies
+COPY a1/ /tmp/a1
+COPY tests/ /tmp/tests
+COPY setup.py tox.ini /tmp/
+WORKDIR /tmp
 
 # Run the unit tests
-RUN tox
+RUN tox -e py38,flake8