X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=Dockerfile;h=df436e90d9add966cbc19a85157f6ac422a3fb3b;hb=HEAD;hp=5c0f31ec7e7ee1b9a31ded2ab9ecdcc29986d9dd;hpb=2aea20bff40d5839b8d1a8bc8b0d6984ee8fcb23;p=ric-app%2Fkpimon.git

diff --git a/Dockerfile b/Dockerfile
index 5c0f31e..df436e9 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,9 @@
 ARG STAGE_DIR=/tmp/kpi-xapp
 
 #==================================================================================
-FROM nexus3.o-ran-sc.org:10001/ubuntu:16.04 as ricbuild
+#FROM nexus3.o-ran-sc.org:10001/ubuntu:16.04 as ricbuild
+FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu16-c-go:3-u16.04-nng as ricbuild
+
 
 # to override repo base, pass in repo argument when running docker build:
 # docker build --build-arg REPOBASE=http://abc.def.org . ....
@@ -11,69 +13,70 @@ ARG STAGE_DIR
 # Install necessary packages
 WORKDIR ${STAGE_DIR}
 RUN apt-get update  \
-     && apt-get install -y \
-     libcurl4-openssl-dev \
-     libcurl3 \
-     cmake \
-     git \
-     build-essential \
-     automake \
-     autoconf-archive \
-     autoconf \
-     pkg-config \
-     gawk \
-     libtool \
-     wget \
-     zlib1g-dev \
-     libffi-dev \
-     && apt-get clean
+      && apt-get install -y \
+      libcurl4-openssl-dev \
+      libcurl3 \
+      cmake \
+      git \
+      build-essential \
+      automake \
+      autoconf-archive \
+      autoconf \
+      pkg-config \
+      gawk \
+      libtool \
+      wget \
+      zlib1g-dev \
+      libffi-dev \
+      && apt-get clean
 
 # Install mdclog using debian package hosted at packagecloud.io
-ARG MDC_VER=0.0.3-1
-RUN wget -nv --content-disposition https://packagecloud.io/o-ran-sc/master/packages/debian/stretch/mdclog_${MDC_VER}_amd64.deb/download.deb
-RUN wget -nv --content-disposition https://packagecloud.io/o-ran-sc/master/packages/debian/stretch/mdclog-dev_${MDC_VER}_amd64.deb/download.deb
+ARG MDC_VER=0.0.4-1
+RUN wget --content-disposition https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/mdclog_${MDC_VER}_amd64.deb/download.deb
+RUN wget --content-disposition https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/mdclog-dev_${MDC_VER}_amd64.deb/download.deb
 RUN dpkg -i mdclog_${MDC_VER}_amd64.deb
 RUN dpkg -i mdclog-dev_${MDC_VER}_amd64.deb
 
 # Install RMR using debian package hosted at packagecloud.io
-ARG RMR_VER=1.3.0
-RUN wget -nv --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr_${RMR_VER}_amd64.deb/download.deb
-RUN wget -nv --content-disposition https://packagecloud.io/o-ran-sc/staging/packages/debian/stretch/rmr-dev_${RMR_VER}_amd64.deb/download.deb
+ARG RMR_VER=1.11.2
+RUN wget --content-disposition https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/rmr_${RMR_VER}_amd64.deb/download.deb
+RUN wget --content-disposition https://packagecloud.io/o-ran-sc/release/packages/debian/stretch/rmr-dev_${RMR_VER}_amd64.deb/download.deb
 RUN dpkg -i rmr_${RMR_VER}_amd64.deb
 RUN dpkg -i rmr-dev_${RMR_VER}_amd64.deb
 
+# Install Hiredis Library
+RUN cd /tmp/ && \
+    git clone https://github.com/redis/hiredis.git && \
+    cd hiredis && \
+    make all install
+
 ##-----------------------------------
 # Now install the program
 #------------------------------------
 COPY ./ ${STAGE_DIR}
-RUN export CPATH=$CPATH:/usr/local/include && \ 
+RUN export CPATH=$CPATH:/usr/local/include && \
     cd src && \
     make clean && \
-    make install 
+    make install
 
 #---------------------------------------------
 # Build the final version
 #FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu16-c-go:1-u16.04-nng1.1.1
 
 FROM ubuntu:16.04
+#FROM nexus3.o-ran-sc.org:10004/bldr-ubuntu16-c-go:2-u16.04-nng
 
 ARG STAGE_DIR
 
-# Install Hiredis Library
-RUN cd /tmp/
-RUN git clone https://github.com/redis/hiredis.git
-RUN cd hiredis
-RUN make all
-
 # copy just the needed libraries install it into the final image
-RUN cd ${STAGE_DIR}/src
+RUN mkdir -p ${STAGE_DIR}/src && cd ${STAGE_DIR}/src
 COPY --from=ricbuild ${STAGE_DIR}/*.deb /tmp/
 COPY --from=ricbuild /usr/local/lib/libnng* /usr/local/lib/
 RUN dpkg -i /tmp/*.deb
 RUN apt-get update && \
     apt-get install -y libcurl3 && \
     apt-get clean
-COPY --from=ricbuild /etc/xapp/* /etc/xapp/
+#COPY --from=ricbuild /etc/xapp/* /etc/xapp/
 COPY --from=ricbuild /usr/local/bin/kpi-xapp /usr/local/bin/kpi-xapp
 #COPY --from=ricbuild /usr/local/bin/e2e-test-client /usr/local/bin/e2e-test-client
 #COPY --from=ricbuild /usr/local/bin/mock-e2term-server /usr/local/bin/mock-e2term-server
@@ -93,3 +96,4 @@ ARG gNodeB=NYC123,ABC345,CDR331
 ARG THREADS=1
 
 CMD ./kpi-xapp -g $gNodeB -t $THREADS
+