X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=Dockerfile;h=cf79e1751e648950008bb1a329c0f9387b9e44ed;hb=36d6d9b1ad748c7e05d6192563727b74a208afd5;hp=3005c0666390ed2cd705c41c35975b39b07183dd;hpb=301bb33a79e5e2cb5b05695b07e07c239a08d099;p=ric-plt%2Fa1.git

diff --git a/Dockerfile b/Dockerfile
index 3005c06..cf79e17 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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,34 +14,55 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 # ==================================================================================
-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
-RUN git checkout a012cf63dfdad3656c995cb06c316fd208c63b98
-RUN mkdir .build; cd .build; cmake ..; make install
-
-# Install python-rmr
+# This container uses a 2 stage build!
+# Tips and tricks were learned from: https://pythonspeed.com/articles/multi-stage-docker-python/
+FROM python:3.8-alpine AS compile-image
+# upgrade pip as root
 RUN pip install --upgrade pip
+# Gevent needs gcc, make, file, ffi
+RUN apk update && apk add gcc musl-dev make file libffi-dev
+# create a non-root user.  Only really needed in stage 2,
+# however this makes the copying easier and straighttforward;
+# pip option --user doesn't do the same thing if run as root
+RUN addgroup -S a1user && adduser -S -G a1user a1user
+# switch to the non-root user for installing site packages
+USER a1user
+# Speed hack; we install gevent before a1 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 --user gevent
+COPY setup.py /home/a1user/
+COPY a1/ /home/a1user/a1
+RUN pip install --user /home/a1user
 
-#install a1
-WORKDIR /tmp
+###########
+# 2nd stage
+FROM python:3.8-alpine
 
-# Run our unit tests
-RUN pip install tox
-RUN tox
+# 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/
 
-# do the actual install
-RUN pip install .
-EXPOSE 10000
-
-# rmr setups
+# copy python modules; this makes the 2 stage python build work
+COPY --from=compile-image /home/a1user/.local /home/a1user/.local
+# create mount point for dir with rmr routing file as named below
 RUN mkdir -p /opt/route/
-ENV LD_LIBRARY_PATH /usr/local/lib
+# create a non-root user
+RUN addgroup -S a1user && adduser -S -G a1user a1user
+# ensure the non-root user can read python files
+RUN chown -R a1user:a1user /home/a1user/.local
+# switch to the non-root user for security reasons
+USER a1user
+# misc setups
+EXPOSE 10000
+ENV LD_LIBRARY_PATH /usr/local/lib/:/usr/local/lib64
 ENV RMR_SEED_RT /opt/route/local.rt
+# Set to True to run standalone
+ENV USE_FAKE_SDL False
+ENV PYTHONUNBUFFERED 1
+# pip installs console script to ~/.local/bin so PATH is critical
+ENV PATH /home/a1user/.local/bin:$PATH
+# prometheus client gathers data here
+ENV prometheus_multiproc_dir /tmp
 
-CMD run.py
+# Run!
+CMD run-a1