summaryrefslogtreecommitdiffstats
path: root/deployment
diff options
context:
space:
mode:
Diffstat (limited to 'deployment')
-rwxr-xr-x[-rw-r--r--]deployment/docker-build.sh0
-rwxr-xr-x[-rw-r--r--]deployment/docker-entrypoint.sh8
-rwxr-xr-x[-rw-r--r--]deployment/run.sh2
-rwxr-xr-x[-rw-r--r--]deployment/setup-dependency.sh0
4 files changed, 5 insertions, 5 deletions
diff --git a/deployment/docker-build.sh b/deployment/docker-build.sh
index 767554f..767554f 100644..100755
--- a/deployment/docker-build.sh
+++ b/deployment/docker-build.sh
diff --git a/deployment/docker-entrypoint.sh b/deployment/docker-entrypoint.sh
index 9b29e3e..0ec8d0e 100644..100755
--- 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
index 1aae1f6..2451ef9 100644..100755
--- 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
index fcb2d51..fcb2d51 100644..100755
--- a/deployment/setup-dependency.sh
+++ b/deployment/setup-dependency.sh