From: jyoak <jy.oak@samsung.com>
Date: Tue, 19 Nov 2019 14:55:40 +0000 (+0900)
Subject: modify dockerfile
X-Git-Tag: 0.0.1~4
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=94c1b18958b1376a6401065d136f0ec97f582804;p=ric-app%2Fkpimon.git

modify dockerfile

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

diff --git a/Dockerfile b/Dockerfile
index 5c0f31e..fcc7e65 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,22 +11,22 @@ 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
@@ -42,6 +42,12 @@ RUN wget -nv --content-disposition https://packagecloud.io/o-ran-sc/staging/pack
 RUN dpkg -i rmr_${RMR_VER}_amd64.deb
 RUN dpkg -i rmr-dev_${RMR_VER}_amd64.deb
 
+# Install Hiredis Library
+RUN cd /tmp/
+RUN git clone https://github.com/redis/hiredis.git
+RUN cd hiredis
+RUN make all
+
 ##-----------------------------------
 # Now install the program
 #------------------------------------
@@ -59,12 +65,6 @@ FROM ubuntu:16.04
 
 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
 COPY --from=ricbuild ${STAGE_DIR}/*.deb /tmp/