X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=Dockerfile-Unit-Test;h=dbb5401aef3ea3cf81548383b5e7912faed453c5;hb=0719e9e18b09451bee9a6d81c4faccf69d425740;hp=00b87fa15da33879a8b75d41bf12455c64dbb43a;hpb=40caa314d23122f0bd25c0e66b65d10303538164;p=ric-plt%2Fa1.git diff --git a/Dockerfile-Unit-Test b/Dockerfile-Unit-Test index 00b87fa..dbb5401 100644 --- a/Dockerfile-Unit-Test +++ b/Dockerfile-Unit-Test @@ -16,8 +16,8 @@ # ================================================================================== # 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 \ +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 \ @@ -26,6 +26,15 @@ RUN git clone --branch 1.3.0 https://gerrit.o-ran-sc.org/r/ric-plt/lib/rmr \ 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 + +# 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 --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 @@ -34,14 +43,5 @@ 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 tox -e py37,flake8