From a23a7c44882d60b73075f67ffc53dfe6606ccb8e Mon Sep 17 00:00:00 2001 From: Jan Szumiec Date: Thu, 15 Apr 2021 07:05:00 +0200 Subject: [PATCH 1/2] Fixed a linter warning. --- plugins/storage/functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/storage/functions b/plugins/storage/functions index 86d3b096e..f6d87e8bb 100755 --- a/plugins/storage/functions +++ b/plugins/storage/functions @@ -7,7 +7,7 @@ source "$PLUGIN_AVAILABLE_PATH/docker-options/functions" verify_paths() { declare desc="verifies storage paths" local -r passed_path=$1 - if [[ "$passed_path" = /* ]]; then + 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." From 4af837b987a7892ebc8791d1524af463b46dbf83 Mon Sep 17 00:00:00 2001 From: Jan Szumiec Date: Thu, 15 Apr 2021 21:28:46 +0200 Subject: [PATCH 2/2] Some Dockerfiles will have CRLF line terminators which will prevent us from parsing EXPOSE directives. --- plugins/builder-dockerfile/builder-build | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/builder-dockerfile/builder-build b/plugins/builder-dockerfile/builder-build index 5677fdaed..7ff239b92 100755 --- a/plugins/builder-dockerfile/builder-build +++ b/plugins/builder-dockerfile/builder-build @@ -20,6 +20,7 @@ trigger-builder-dockerfile-builder-build() { pushd "$SOURCECODE_WORK_DIR" &>/dev/null # extract first port from Dockerfile + dos2unix Dockerfile local DOCKERFILE_PORTS=$(get_dockerfile_exposed_ports Dockerfile) [[ -n "$DOCKERFILE_PORTS" ]] && config_set --no-restart "$APP" DOKKU_DOCKERFILE_PORTS="$DOCKERFILE_PORTS" plugn trigger pre-build-dockerfile "$APP"