Update Dockerfile

Change-Id: Id4410661e562f43a9d331505b8e59984744079e7
Signed-off-by: jyoak <jy.oak@samsung.com>

diff --git a/Dockerfile b/Dockerfile
index fcc7e65..8ae7524 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:10001/ubuntu:16.04 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:2-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
@@ -43,37 +45,38 @@ RUN dpkg -i rmr_${RMR_VER}_amd64.deb
 RUN dpkg -i rmr-dev_${RMR_VER}_amd64.deb\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
+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
 # 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