From 12531dfb3e719cbf0719a529d7e9dec429b77680 Mon Sep 17 00:00:00 2001 From: nisseknudsen Date: Sun, 10 Jan 2021 19:26:16 +0100 Subject: [PATCH] Regex handles absolute mount path _and_ named volumes --- plugins/storage/functions | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/plugins/storage/functions b/plugins/storage/functions index 6fc97da21..280047cf1 100755 --- a/plugins/storage/functions +++ b/plugins/storage/functions @@ -6,7 +6,13 @@ source "$PLUGIN_AVAILABLE_PATH/docker-options/functions" verify_paths() { declare desc="verifies storage paths" - echo "$1" | grep -qe '^/.*\:/' || dokku_log_fail "Storage path must be two valid paths divided by colon." + local -r passed_path=$1 + if [[ "$passed_path" = \* ]]; then + echo "$passed_path" | grep -qe '^/.*\:/' || dokku_log_fail "Storage path must be two valid paths divided by colon." + else + echo "$passed_path" | grep -qe '^[a-zA-Z0-9]\{1\}[a-zA-Z0-9_.-]\+\:\/' || dokku_log_fail "Volume name must be two characters or more. Volume name must not contain invalid characters. Storage path must be two valid paths divided by colon." + fi + } check_if_path_exists() {