X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=Dockerfile;h=c8ef4205d4c8387a12b59b461732290019650e33;hb=d26734faf0366f95ed055a783fed8297f8c63ff6;hp=6d1f78a414958bc1a38968ab2ba4dd709c997ebb;hpb=296f8de21e17880d0a12f9a964b14712f14d871a;p=ric-plt%2Fa1.git

diff --git a/Dockerfile b/Dockerfile
index 6d1f78a..c8ef420 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,35 +14,46 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 # ==================================================================================
-FROM python:3.7-alpine
 
-# copy NNG and rmr out of the  CI builder nng
-COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3:3-a3.9 /usr/local/lib64/libnng.so /usr/local/lib64/libnng.so
-COPY --from=nexus3.o-ran-sc.org:10004/bldr-alpine3:3-a3.9 /usr/local/lib64/librmr_nng.so /usr/local/lib64/librmr_nng.so
+# 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
+# Gevent needs gcc, make, file, ffi
+RUN apk update && apk add gcc musl-dev make file libffi-dev
 
-COPY a1/ /tmp/a1
-COPY tests/ /tmp/tests
-COPY setup.py tox.ini /tmp/
-WORKDIR /tmp
+# Switch to a non-root user for security reasons
+# This is only really needed in stage 2 however this makes the copying easier and straitforward! --user doesn't do the same thing if run as root!
+RUN addgroup -S a1user && adduser -S -G a1user a1user
+USER a1user
 
-# dir that rmr routing file temp goes into
-RUN mkdir -p /opt/route/
+# Speed hack; we install gevent FIRST 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 --user gevent
+COPY setup.py /home/a1user/
+COPY a1/ /home/a1user/a1
+RUN pip install --user /home/a1user
 
-# Gevent needs gcc; TODO: this will get fixed
-RUN apk add gcc musl-dev
+###########
+# 2nd stage
+FROM python:3.8-alpine
 
-# do the actual install; this writes into /usr/local, need root
-RUN pip install .
+# 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.2 /usr/local/lib64/librmr* /usr/local/lib64/
 
-# 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
+# dir that rmr routing file temp goes into
+RUN mkdir -p /opt/route/
+# python copy; this basically makes the 2 stage python build work
+COPY --from=compile-image /home/a1user/.local /home/a1user/.local
 
+# 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.
+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
+ENV PYTHONUNBUFFERED 1
+# This step is critical
+ENV PATH=/home/a1user/.local/bin:$PATH
 
+# Run!
 CMD run.py