From ebea56ff7ed0765ad0328ceb65efaf3abe1f9eff Mon Sep 17 00:00:00 2001
From: Eike Cochu <eike@cochu.com>
Date: Sat, 9 Apr 2016 14:58:41 +0200
Subject: [PATCH] updated docker scripts, accept configuration
---
docker/docker-build.sh | 18 ++++++++++++++++++
docker/docker-run.sh | 21 ++++++++++++++++++++-
2 files changed, 38 insertions(+), 1 deletion(-)
diff --git a/docker/docker-build.sh b/docker/docker-build.sh
index 6b37c7c1..3351abcf 100755
--- a/docker/docker-build.sh
+++ b/docker/docker-build.sh
@@ -1,4 +1,22 @@
#!/bin/sh
+#######################################################################################
+# CONFIGURATION
+
+BUILD_WITH_BACKEND=1
+BUILD_WITH_FRONTEND=1
+
+#######################################################################################
+
+DIR="$(dirname "$(readlink -f "$0")")"
+
+if [ $BUILD_WITH_BACKEND -ne 1 ]; then
+ find webapps -maxdepth 1 -not -name ".*" -not -path webapps -exec rm -rf {} \;
+fi
+
+if [ $BUILD_WITH_FRONTEND -ne 1 ]; then
+ find webroot -maxdepth 1 -not -name ".*" -not -path webroot -exec rm -rf {} \;
+fi
+
docker build -t eikecochu/vipra .
exit 0
\ No newline at end of file
diff --git a/docker/docker-run.sh b/docker/docker-run.sh
index d241c725..752761e7 100755
--- a/docker/docker-run.sh
+++ b/docker/docker-run.sh
@@ -1,11 +1,30 @@
#!/bin/sh
+#######################################################################################
+# CONFIGURATION
+
+# set host machine ports
HOST_NGINX=80
HOST_TOMCAT=8080
HOST_ELASTICSEARCH_REST=9200
HOST_ELASTICSEARCH_API=9300
HOST_MONGODB=27017
+# set to 1 to override built in webapps and webroot
+REPLACE_WEBAPPS=1
+REPLACE_WEBROOT=1
+
+#######################################################################################
+
DIR="$(dirname "$(readlink -f "$0")")"
+PORT_MAPPING="-p $HOST_NGINX:80 -p $HOST_TOMCAT:8080 -p $HOST_ELASTICSEARCH_REST:9200 -p $HOST_ELASTICSEARCH_API:9300 -p $HOST_MONGODB:27017"
+
+if [ $REPLACE_WEBAPPS -eq 1 ]; then
+ VOLUME_WEBAPPS="-v $DIR/webapps:/tomcat/webapps"
+fi
+
+if [ $REPLACE_WEBROOT -eq 1 ]; then
+ VOLUME_WEBROOT="-v $DIR/webroot:/webroot"
+fi
-docker run -d -p $HOST_NGINX:80 -p $HOST_TOMCAT:8080 -p $HOST_ELASTICSEARCH_REST:9200 -p $HOST_ELASTICSEARCH_API:9300 -p $HOST_MONGODB:27017 -v $DIR/webroot:/webroot -v $DIR/webapps:/tomcat/webapps eikecochu/vipra
\ No newline at end of file
+docker run -d $PORT_MAPPING $VOLUME_WEBAPPS $VOLUME_WEBROOT eikecochu/vipra
\ No newline at end of file
--
GitLab