Use base Docker image with NNG v1.1.1

[ric-plt/a1.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index be8d8da..9373cc2 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,27 +16,25 @@
 # ==================================================================================
 
 # CI to build a Docker image with the A1 mediator
-# Adds gcc and cmake to build RMr library
+# Relies on NNG from base image
+# Installs RMr using debian package hosted at packagecloud.io
 
-FROM python:3.7
+FROM nexus3.o-ran-sc.org:10004/bldr-debian-python-nng:2-py3.7-nng1.1.1
 
-ADD . /tmp
+COPY . /tmp
+WORKDIR /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
+# Install RMr library
+RUN wget --content-disposition https://packagecloud.io/o-ran-sc/master/packages/debian/stretch/rmr_1.0.34_amd64.deb/download.deb
+RUN dpkg -i rmr_1.0.34_amd64.deb
 
-# Install python-rmr
+# Install RMr python bindings
 RUN pip install --upgrade pip
+RUN pip install rmr==0.10.1
 
-#install a1
-WORKDIR /tmp
+# install a1
 
-# Run our unit tests
+# Prereq for unit tests
 RUN pip install tox
 RUN tox