Code Review
/
ric-plt
/
a1.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
A1 v2.1.0
[ric-plt/a1.git]
/
Dockerfile-Unit-Test
diff --git
a/Dockerfile-Unit-Test
b/Dockerfile-Unit-Test
index
00b87fa
..
dbb5401
100644
(file)
--- a/
Dockerfile-Unit-Test
+++ b/
Dockerfile-Unit-Test
@@
-16,8
+16,8
@@
# ==================================================================================
# install a well known working rmr
FROM python:3.7-alpine
# ==================================================================================
# 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 \
&& 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
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
# 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
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 the unit tests
-RUN tox
+RUN tox
-e py37,flake8