X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=Dockerfile;h=988cdfd902dc88c7ec774a151a1b7e9177324d9c;hb=a0876efd819b43b870ba2254b34676b1a03ad326;hp=be8d8da50c4f39a868c046e281dd807d0c1b063f;hpb=0caac0f8bacd54d8b7ae81eda2e5fb53852aaad9;p=ric-plt%2Fa1.git

diff --git a/Dockerfile b/Dockerfile
index be8d8da..988cdfd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,39 +14,50 @@
 #   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.9.0 https://gerrit.o-ran-sc.org/r/ric-plt/lib/rmr \
+    && cd rmr \
+    && mkdir build \
+    && cd build \
+    && cmake .. -DPACK_EXTERNALS=1 \
+    && make install
+
+# a1 stage 2
+FROM python:3.7-alpine
+
+# dir that rmr routing file temp goes into
+RUN mkdir -p /opt/route/
 
-# CI to build a Docker image with the A1 mediator
-# Adds gcc and cmake to build RMr library
-
-FROM python:3.7
-
-ADD . /tmp
-
-# Install RMr
-RUN apt-get update && apt-get install -y gcc git cmake
-RUN git clone https://gerrit.oran-osc.org/r/ric-plt/lib/rmr
-WORKDIR rmr
-# This pins RMr to a known working version
-RUN git checkout 68d09fa5028e47e763c44c30647da31e77eda64a
-RUN mkdir .build; cd .build; cmake ..; make install
+# Gevent needs gcc
+RUN apk update && apk add bash gcc musl-dev
 
-# Install python-rmr
-RUN pip install --upgrade pip
+# Speed hack; we install gevent here because when building repeatedly (eg during dev) and only changing a1 code,
+# we do not need to keep compiling gevent which takes forever
+RUN pip install --upgrade pip && pip install gevent
 
-#install a1
+# 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 setup.py tox.ini /tmp/
 WORKDIR /tmp
 
-# Run our unit tests
-RUN pip install tox
-RUN tox
-
-# do the actual install
+# do the actual install; this writes into /usr/local, need root
 RUN pip install .
-EXPOSE 10000
 
-# rmr setups
-RUN mkdir -p /opt/route/
-ENV LD_LIBRARY_PATH /usr/local/lib
+# Switch to a non-root user for security reasons.
+# a1 does not currently write into any dirs so no chowns are needed at this time.
+ENV A1USER a1user
+RUN addgroup -S $A1USER && adduser -S -G $A1USER $A1USER
+USER $A1USER
+
+# misc setups
+EXPOSE 10000
+ENV LD_LIBRARY_PATH /usr/local/lib/:/usr/local/lib64
 ENV RMR_SEED_RT /opt/route/local.rt
+# dont buffer logging
+ENV PYTHONUNBUFFERED 1
 
 CMD run.py