Updated INFO.yaml file

[ric-app/kpimon.git] / Dockerfile

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