1 files changed, 17 insertions, 22 deletions

diff --git a/deployment/Dockerfile b/deployment/Dockerfile
index 7f6c6d5..e9fe30d 100644
--- a/deployment/Dockerfile
+++ b/deployment/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:14.04
+FROM alpine:3.7
 
 ARG HTTP_PROXY=${HTTP_PROXY}
 ARG HTTPS_PROXY=${HTTPS_PROXY}
@@ -8,18 +8,14 @@ ENV https_proxy $HTTPS_PROXY
 ENV CONSUL_IP $CONSUL_IP
 ENV CONSUL_VERSION 1.0.6
 
-# Run Docker build from dkv directory.
-WORKDIR /distributed-kv-store
-
-RUN apt-get update && \
-    apt-get install -y build-essential && \
-    apt-get install -y realpath && \
-    apt-get install -y unzip && \
-    apt-get install -y git && \
-    apt-get install -y curl && \
-    apt-get install -y wget && \
-    git clone https://git.onap.org/music/distributed-kv-store
-
+RUN apk update && \
+    apk add g++ && \
+    apk add make && \
+    apk add unzip && \
+    apk add git && \
+    apk add curl && \
+    apk add wget && \
+    apk add --no-cache bash
 
 RUN wget -qO /tmp/consul.zip "https://releases.hashicorp.com/consul/${CONSUL_VERSION}/consul_${CONSUL_VERSION}_linux_amd64.zip" && \
     unzip -d /bin /tmp/consul.zip && \
@@ -29,15 +25,14 @@ RUN wget -qO /tmp/consul.zip "https://releases.hashicorp.com/consul/${CONSUL_VER
 EXPOSE 8200
 EXPOSE 8080
 
-# Change this when deployment gets merged.
-WORKDIR /distributed-kv-store/distributed-kv-store/deployment/
-ADD ./setup-dependency.sh /distributed-kv-store/distributed-kv-store/deployment/
-ADD ./docker-entrypoint.sh /distributed-kv-store/distributed-kv-store/deployment/
 
-WORKDIR /distributed-kv-store/distributed-kv-store
-RUN deployment/setup-dependency.sh
+RUN mkdir /dkv_mount_path && \
+    mkdir /dkv_mount_path/consul_data && \
+    mkdir /dkv_mount_path/configs && \
+    mkdir /dkv_mount_path/configs/default
 
-VOLUME /configs
+WORKDIR /dkv_mount_path
+ADD ./dkv /dkv_mount_path/
+ADD ./docker-entrypoint.sh /dkv_mount_path/
 
-ENTRYPOINT deployment/docker-entrypoint.sh
-#ENTRYPOINT /bin/bash
\ No newline at end of file
+ENTRYPOINT /dkv_mount_path/docker-entrypoint.sh
\ No newline at end of file