X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=Dockerfile-Unit-Test;h=afbd61a426c5151b82225f753ee32a34da7ed32e;hb=8597ea9b28b88f5cefe8cc4e54c46fceeee84e55;hp=882b759784c7eba744ab9518eb668f2175f01363;hpb=296f8de21e17880d0a12f9a964b14712f14d871a;p=ric-plt%2Fa1.git

diff --git a/Dockerfile-Unit-Test b/Dockerfile-Unit-Test
index 882b759..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,25 +14,22 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 # ==================================================================================
-FROM python:3.7-alpine
+FROM python:3.8-alpine
 
-# copy NNG and rmr out of the  CI builder nng
-COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3:3-a3.9 /usr/local/lib64/libnng.so /usr/local/lib64/libnng.so
-COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3:3-a3.9 /usr/local/lib64/librmr_nng.so /usr/local/lib64/librmr_nng.so
+# 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 setup.py tox.ini /tmp/
 COPY a1/ /tmp/a1
 COPY tests/ /tmp/tests
-COPY setup.py tox.ini /tmp/
 WORKDIR /tmp
 
-# dir that rmr routing file temp goes into
-RUN mkdir -p /opt/route/
-
-# Gevent needs gcc; TODO: this will get fixed
-RUN apk add gcc musl-dev
-
-# Upgrade pip, install tox
-RUN pip install --upgrade pip && pip install tox
-
-# Run the unit tests
-RUN tox
+# Run the unit tests but skip doc
+RUN tox -e code,flake8