Merge pull request #8563 from dokku/8560-fn-plugin-property-get-default-command-not-found
Source property-functions where fn-plugin-property-* helpers are used
This commit is contained in:
11 files changed
+23
No files matched your search
@@ -1,5 +1,6 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
||||||
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/property-functions"
|
||||||
source "$PLUGIN_AVAILABLE_PATH/proxy/command-functions"
|
source "$PLUGIN_AVAILABLE_PATH/proxy/command-functions"
|
||||||
source "$PLUGIN_AVAILABLE_PATH/caddy-vhosts/internal-functions"
|
source "$PLUGIN_AVAILABLE_PATH/caddy-vhosts/internal-functions"
|
||||||
set -eo pipefail
|
set -eo pipefail
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
||||||
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/property-functions"
|
||||||
source "$PLUGIN_AVAILABLE_PATH/caddy-vhosts/command-functions"
|
source "$PLUGIN_AVAILABLE_PATH/caddy-vhosts/command-functions"
|
||||||
set -eo pipefail
|
set -eo pipefail
|
||||||
[[ $DOKKU_TRACE ]] && set -x
|
[[ $DOKKU_TRACE ]] && set -x
|
||||||
|
|||||||
@@ -636,6 +636,10 @@ release_and_deploy() {
|
|||||||
local exit_code=0
|
local exit_code=0
|
||||||
|
|
||||||
if verify_image "$IMAGE"; then
|
if verify_image "$IMAGE"; then
|
||||||
|
if ! declare -f -F fn-plugin-property-get-default >/dev/null; then
|
||||||
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/property-functions"
|
||||||
|
fi
|
||||||
|
|
||||||
IMAGE_SOURCE_TYPE="$(get_image_builder_type "$IMAGE" "$APP")"
|
IMAGE_SOURCE_TYPE="$(get_image_builder_type "$IMAGE" "$APP")"
|
||||||
local DOKKU_APP_SKIP_DEPLOY="$(fn-plugin-property-get-default "ps" "$APP" "skip-deploy" "")"
|
local DOKKU_APP_SKIP_DEPLOY="$(fn-plugin-property-get-default "ps" "$APP" "skip-deploy" "")"
|
||||||
local DOKKU_GLOBAL_SKIP_DEPLOY="$(fn-plugin-property-get-default "ps" "--global" "skip-deploy" "")"
|
local DOKKU_GLOBAL_SKIP_DEPLOY="$(fn-plugin-property-get-default "ps" "--global" "skip-deploy" "")"
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
||||||
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/property-functions"
|
||||||
source "$PLUGIN_AVAILABLE_PATH/proxy/command-functions"
|
source "$PLUGIN_AVAILABLE_PATH/proxy/command-functions"
|
||||||
source "$PLUGIN_AVAILABLE_PATH/haproxy-vhosts/internal-functions"
|
source "$PLUGIN_AVAILABLE_PATH/haproxy-vhosts/internal-functions"
|
||||||
set -eo pipefail
|
set -eo pipefail
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
||||||
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/property-functions"
|
||||||
source "$PLUGIN_AVAILABLE_PATH/haproxy-vhosts/command-functions"
|
source "$PLUGIN_AVAILABLE_PATH/haproxy-vhosts/command-functions"
|
||||||
set -eo pipefail
|
set -eo pipefail
|
||||||
[[ $DOKKU_TRACE ]] && set -x
|
[[ $DOKKU_TRACE ]] && set -x
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
||||||
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/property-functions"
|
||||||
source "$PLUGIN_AVAILABLE_PATH/nginx-vhosts/command-functions"
|
source "$PLUGIN_AVAILABLE_PATH/nginx-vhosts/command-functions"
|
||||||
set -eo pipefail
|
set -eo pipefail
|
||||||
[[ $DOKKU_TRACE ]] && set -x
|
[[ $DOKKU_TRACE ]] && set -x
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
||||||
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/property-functions"
|
||||||
source "$PLUGIN_AVAILABLE_PATH/proxy/command-functions"
|
source "$PLUGIN_AVAILABLE_PATH/proxy/command-functions"
|
||||||
source "$PLUGIN_AVAILABLE_PATH/openresty-vhosts/internal-functions"
|
source "$PLUGIN_AVAILABLE_PATH/openresty-vhosts/internal-functions"
|
||||||
set -eo pipefail
|
set -eo pipefail
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
||||||
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/property-functions"
|
||||||
source "$PLUGIN_AVAILABLE_PATH/openresty-vhosts/command-functions"
|
source "$PLUGIN_AVAILABLE_PATH/openresty-vhosts/command-functions"
|
||||||
set -eo pipefail
|
set -eo pipefail
|
||||||
[[ $DOKKU_TRACE ]] && set -x
|
[[ $DOKKU_TRACE ]] && set -x
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
||||||
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/property-functions"
|
||||||
source "$PLUGIN_AVAILABLE_PATH/proxy/command-functions"
|
source "$PLUGIN_AVAILABLE_PATH/proxy/command-functions"
|
||||||
source "$PLUGIN_AVAILABLE_PATH/traefik-vhosts/internal-functions"
|
source "$PLUGIN_AVAILABLE_PATH/traefik-vhosts/internal-functions"
|
||||||
set -eo pipefail
|
set -eo pipefail
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
||||||
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/property-functions"
|
||||||
source "$PLUGIN_AVAILABLE_PATH/traefik-vhosts/command-functions"
|
source "$PLUGIN_AVAILABLE_PATH/traefik-vhosts/command-functions"
|
||||||
set -eo pipefail
|
set -eo pipefail
|
||||||
[[ $DOKKU_TRACE ]] && set -x
|
[[ $DOKKU_TRACE ]] && set -x
|
||||||
|
|||||||
@@ -112,6 +112,16 @@ teardown() {
|
|||||||
assert_urls "http://dokku.example.com" "http://${TEST_APP}.${DOKKU_DOMAIN}" "https://dokku.example.com" "https://${TEST_APP}.${DOKKU_DOMAIN}" "https://test.${DOKKU_DOMAIN}" "http://test.${DOKKU_DOMAIN}"
|
assert_urls "http://dokku.example.com" "http://${TEST_APP}.${DOKKU_DOMAIN}" "https://dokku.example.com" "https://${TEST_APP}.${DOKKU_DOMAIN}" "https://test.${DOKKU_DOMAIN}" "http://test.${DOKKU_DOMAIN}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@test "(core) release_and_deploy does not emit command not found errors" {
|
||||||
|
run deploy_app
|
||||||
|
echo "output: $output"
|
||||||
|
echo "status: $status"
|
||||||
|
assert_success
|
||||||
|
assert_output_not_contains "fn-plugin-property-get-default: command not found"
|
||||||
|
assert_output_not_contains "fn-plugin-property-get: command not found"
|
||||||
|
assert_output_not_contains "/common/property-functions: No such file or directory"
|
||||||
|
}
|
||||||
|
|
||||||
@test "(core) git-remote (off-port)" {
|
@test "(core) git-remote (off-port)" {
|
||||||
run deploy_app nodejs-express ssh://dokku@127.0.0.1:22333/$TEST_APP
|
run deploy_app nodejs-express ssh://dokku@127.0.0.1:22333/$TEST_APP
|
||||||
echo "output: $output"
|
echo "output: $output"
|
||||||
|
|||||||
Reference in new issue
Block a user