X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=Dockerfile-Unit-Test;h=b71302a6cf1a5885d1a465fc53fb35c7ec612c55;hb=4014a85d3cc546bf39ffa64c5cfe6e21944d2afb;hp=dbb5401aef3ea3cf81548383b5e7912faed453c5;hpb=9d5ad7161f64346c17e9c466bf1992e4257e9bde;p=ric-plt%2Fa1.git 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/