From 864eafac295bb9cc4c0b4315aa7c262eb214ccc6 Mon Sep 17 00:00:00 2001
From: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Date: Wed, 4 Oct 2017 18:25:24 +0530
Subject: Remove default_parameter section and use is_includ

Issue-Id: CLI-66

Change-Id: I24a3bc4d133d4d69fd6522091f20f88edd6c2f19
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
---
 deployment/docker/src/main/docker/Dockerfile          | 16 ++++++++--------
 deployment/docker/src/main/docker/docker-compose.yaml |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'deployment/docker/src/main')

diff --git a/deployment/docker/src/main/docker/Dockerfile b/deployment/docker/src/main/docker/Dockerfile
index f3665223..57b78284 100644
--- a/deployment/docker/src/main/docker/Dockerfile
+++ b/deployment/docker/src/main/docker/Dockerfile
@@ -11,14 +11,14 @@ RUN cd /tmp && curl -O https://storage.googleapis.com/golang/go1.9.linux-amd64.t
 
 #Environments
 ENV OPEN_CLI_HOME /opt/onap/cli
-ENV ONAP_CLI_DEBUG false
-ENV ONAP_CLI_DEBUG_PORT 5005
-ENV CLI_MODE console
-ENV CLI_PRODUCT_VERSION onap-1.1
+ENV OPEN_CLI_DEBUG false
+ENV OPEN_CLI_DEBUG_PORT 5005
+ENV OPEN_CLI_MODE console
+ENV OPEN_CLI_PRODUCT_VERSION open-cli
 
 ENV HOST_URL http://localhost:8080
-ENV ONAP_USERNAME guest
-ENV ONAP_PASSWORD guest
+ENV OPEN_USERNAME guest
+ENV OPEN_PASSWORD guest
 
 #Copy CLI into docker
 ADD ./STAGE $OPEN_CLI_HOME
@@ -49,9 +49,9 @@ EXPOSE 80
 EXPOSE 8080
 
 #Start
-ENTRYPOINT if [ "$CLI_MODE" = "daemon" ]; then service lighttpd start; gotty --permit-write --reconnect onap; else onap -v && /bin/bash; fi
+ENTRYPOINT if [ "$OPEN_CLI_MODE" = "daemon" ]; then service lighttpd start; gotty --permit-write --reconnect onap; else onap -v && /bin/bash; fi
 
 #Cleanup
 RUN apt-get purge -y pandoc && apt-get autoremove -y && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/go /tmp/gotty /tmp/* /var/tmp/*
 
-RUN echo ONAP CLI docker successfully created !!
\ No newline at end of file
+RUN echo ONAP CLI docker successfully created !!
diff --git a/deployment/docker/src/main/docker/docker-compose.yaml b/deployment/docker/src/main/docker/docker-compose.yaml
index f6273cb8..370ca678 100644
--- a/deployment/docker/src/main/docker/docker-compose.yaml
+++ b/deployment/docker/src/main/docker/docker-compose.yaml
@@ -4,7 +4,7 @@ services:
   occ:
     image: onap/cli
     environment:
-      CLI_MODE: 'daemon'
+      OPEN_CLI_MODE: 'daemon'
     expose:
       - 80
       - 8080
@@ -17,15 +17,15 @@ services:
     tty: true
     image: onap/cli
     environment:
-      CLI_MODE: 'console'
+      OPEN_CLI_MODE: 'console'
 
   debug:
     stdin_open: true
     tty: true
     image: onap/cli
     environment:
-      CLI_MODE: 'console'
-      ONAP_CLI_DEBUG: "true"
+      OPEN_CLI_MODE: 'console'
+      OPEN_CLI_DEBUG: "true"
     expose:
       - 5005
     ports:
-- 
cgit 1.2.3-korg