Merge pull request #2072 from amnonh/allow_local_from_file

Allow local from file
scylladb · Oct 1, 2023 · 524dbb1 · 524dbb1
2 parents 552d725 + 049772e
commit 524dbb1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/start-all.sh b/start-all.sh
@@ -398,6 +398,14 @@ if [ -z "$VERSIONS" ]; then
   exit 1
 fi
 
+DOCKER_PARAMS_ORIGIN="$DOCKER_PARAM"
+DOCKER_PARAM=""
+for val in $DOCKER_PARAMS_ORIGIN; do
+	if [[ "$DOCKER_PARAM" != *"$val"* ]]; then
+		DOCKER_PARAM="$DOCKER_PARAM $val"
+	fi
+done
+
 if [[ $DOCKER_PARAM = *"--net=host"* ]]; then
     if [ ! -z "$ALERTMANAGER_PORT" ] || [ ! -z "$GRAFANA_PORT" ] || [ ! -z $PROMETHEUS_PORT ]; then
         echo "Port mapping is not supported with host network, remove the -l flag from the command line"

diff --git a/start-grafana.sh b/start-grafana.sh
@@ -13,7 +13,6 @@ fi
 if [ -z "$GRAFANA_AUTH_ANONYMOUS" ]; then
     GRAFANA_AUTH_ANONYMOUS=true
 fi
-DOCKER_PARAM=""
 EXTERNAL_VOLUME=""
 BIND_ADDRESS=""
 if [ -z "$ANONYMOUS_ROLE" ]; then
@@ -32,6 +31,7 @@ DEFAULT_THEME="light"
 if [ -f  env.sh ]; then
     . env.sh
 fi
+DOCKER_PARAM=""
 
 BRANCH_VERSION=$CURRENT_VERSION
 if [ -z ${DEFAULT_VERSION[$CURRENT_VERSION]} ]; then