From 086faa54cc995f9850c0946f42a83b58fed02046 Mon Sep 17 00:00:00 2001
From: Shashank Kumar Shankar <shashank.kumar.shankar@intel.com>
Date: Wed, 7 Mar 2018 15:19:20 -0800
Subject: Update some fixes.

Adding some fixes to the docker builds and code.

Change-Id: Ia7446519ad64339eefd79975918b469052a27934
Issue-ID: MUSIC-41
Signed-off-by: Shashank Kumar Shankar <shashank.kumar.shankar@intel.com>
---
 deployment/docker-build.sh      | 0
 deployment/docker-entrypoint.sh | 8 ++++----
 deployment/run.sh               | 2 +-
 deployment/setup-dependency.sh  | 0
 4 files changed, 5 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 deployment/docker-build.sh
 mode change 100644 => 100755 deployment/docker-entrypoint.sh
 mode change 100644 => 100755 deployment/run.sh
 mode change 100644 => 100755 deployment/setup-dependency.sh

(limited to 'deployment')

diff --git a/deployment/docker-build.sh b/deployment/docker-build.sh
old mode 100644
new mode 100755
diff --git a/deployment/docker-entrypoint.sh b/deployment/docker-entrypoint.sh
old mode 100644
new mode 100755
index 9b29e3e..0ec8d0e
--- a/deployment/docker-entrypoint.sh
+++ b/deployment/docker-entrypoint.sh
@@ -8,8 +8,6 @@ function start_consul_server {
     # Running consul in server mode since we are doing a single node. If we need to add more,
     # We need to run multiple consul agents in client mode without providing the -server arguements.
 
-    # CHANGE THIS TO SERVER MODE!
-    # consul agent -dev > /dev/null 2>&1 &
     consul agent -bootstrap -server -bind=127.0.0.1 -data-dir=/dkv/consul &
 }
 
@@ -28,6 +26,8 @@ function set_paths {
 }
 
 set_paths
-start_consul_server
-sleep 5
+if [ "$CONSUL_IP" = "localhost" ]; then
+    start_consul_server
+    sleep 5
+fi
 start_api_server
diff --git a/deployment/run.sh b/deployment/run.sh
old mode 100644
new mode 100755
index 1aae1f6..2451ef9
--- a/deployment/run.sh
+++ b/deployment/run.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
 CONSUL_IP="localhost"
-MOUNTPATH="/configs"
+MOUNTPATH="/configs/"
 
 docker run -e CONSUL_IP=$CONSUL_IP -e MOUNTPATH=$MOUNTPATH -it --name dkv -p 8200:8200 -p 8080:8080 dkv
diff --git a/deployment/setup-dependency.sh b/deployment/setup-dependency.sh
old mode 100644
new mode 100755
-- 
cgit 1.2.3-korg