Handle spaces in filenames. Closes #20

overview · Nov 12, 2018 · c9cdaea · c9cdaea
1 parent e2f212e
commit c9cdaea
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 9 deletions.
diff --git a/common.sh b/common.sh
@@ -15,5 +15,19 @@ UBUNTU_IMAGE="library/ubuntu:17.10"
 
 eval "$(grep -v -E '^#|^OV_WELCOME_BANNER|^$' "$(dirname "$0")"/config/overview.defaults.env | sed 's/^/export /')"
 eval "$(grep -v -E '^#|^OV_WELCOME_BANNER|^$' "$(dirname "$0")"/config/overview.env | sed 's/^/export /')"
-DOCKER_COMPOSE="docker-compose -f $(dirname "$0")/config/overview.yml --project-name overviewlocal"
-grep -q -E '^OV_DOMAIN_NAME=.' "$(dirname "$0")/config/overview.env" && DOCKER_COMPOSE="$DOCKER_COMPOSE -f $(dirname "$0")/config/overview-ssl.yml" || true
+
+# docker_compose: like "docker-compose" but with the arguments we want
+docker_compose() {
+  maybe_ssl1=""
+  maybe_ssl2=""
+  if grep -q -E '^OV_DOMAIN_NAME=.' "$(dirname "$0")"/config/overview.env; then
+    maybe_ssl1="-f"
+    maybe_ssl2="$(dirname "$0")"/config/overview-ssl.yml
+  fi
+
+  docker-compose \
+    -f "$(dirname "$0")"/config/overview.yml \
+    --project-name overviewlocal \
+    $maybe_ssl1 $maybe_ssl2 \
+    "$@"
+}
diff --git a/dump-logs b/dump-logs
@@ -2,4 +2,4 @@
 
 . "$(dirname "$0")"/common.sh
 
-exec $DOCKER_COMPOSE logs --timestamps --tail=all --no-color
+docker_compose logs --timestamps --tail=all --no-color
diff --git a/start-after-git-pull b/start-after-git-pull
@@ -13,10 +13,10 @@ NETWORK="overviewlocal_default"
 migrate_volumes_if_needed
 
 echo "Applying latest schema..."
-$DOCKER_COMPOSE run --rm overview-db-evolution-applier
+docker_compose run --rm overview-db-evolution-applier
 
 echo "Launching Overview..."
-$DOCKER_COMPOSE up --remove-orphans -d
+docker_compose up --remove-orphans -d
 
 echo "OV_URL: $OV_URL; OV_DOMAIN_NAME: $OV_DOMAIN_NAME"
 [ -z "$OV_URL" ] && [ -n "$OV_DOMAIN_NAME" ] && OV_URL="https://$OV_DOMAIN_NAME"

diff --git a/stop b/stop
@@ -4,5 +4,5 @@
 
 set +e
 
-$DOCKER_COMPOSE kill
-$DOCKER_COMPOSE rm -f
+docker_compose kill
+docker_compose rm -f
diff --git a/tail-logs b/tail-logs
@@ -2,4 +2,4 @@
 
 . "$(dirname "$0")"/common.sh
 
-exec $DOCKER_COMPOSE logs --follow --tail=5 --timestamps
+docker_compose logs --follow --tail=5 --timestamps
diff --git a/update b/update
@@ -5,4 +5,4 @@
 docker pull "$BUSYBOX_IMAGE"
 docker pull "$UBUNTU_IMAGE"
 docker pull overview/overview-proxy:latest # TODO use version number
-$DOCKER_COMPOSE pull --parallel
+docker_compose pull --parallel