X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=Dockerfile;h=1e2714a911879cf74f2a0f4270e9af3c1f017aea;hb=refs%2Fchanges%2F55%2F955%2F7;hp=8b445005884ade7936e7ddfa3403b3afe40cb2a4;hpb=5ad8f03e1fc7683bb59da31f59edc2f6c0b2372b;p=ric-plt%2Fa1.git

diff --git a/Dockerfile b/Dockerfile
index 8b44500..1e2714a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,28 +14,48 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 # ==================================================================================
-FROM python:3.7
+# 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 \
+    && cd rmr \
+    && mkdir build \
+    && cd build \
+    && cmake .. -DPACK_EXTERNALS=1 \
+    && make install
 
-ADD . /tmp
+# a1 stage 2
+FROM python:3.7-alpine
 
-# 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
-RUN pip install --upgrade pip 
-
-#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 tests/ /tmp/tests
+COPY setup.py tox.ini /tmp/
 WORKDIR /tmp
-RUN pip install .
-EXPOSE 10000
 
-# rmr setups
+# dir that rmr routing file temp goes into
 RUN mkdir -p /opt/route/
-ENV LD_LIBRARY_PATH /usr/local/lib
+
+# Gevent needs gcc
+RUN apk update && apk add bash gcc musl-dev
+
+# do the actual install; this writes into /usr/local, need root
+RUN pip install --upgrade pip && pip install .
+
+# 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