Merge pull request #4836 from dokku/4830-fix-dockerfile-detection
Fix custom dockerfile path detection
This commit is contained in:
@@ -21,17 +21,6 @@ trigger-builder-dockerfile-builder-build() {
|
|||||||
|
|
||||||
pushd "$SOURCECODE_WORK_DIR" &>/dev/null
|
pushd "$SOURCECODE_WORK_DIR" &>/dev/null
|
||||||
|
|
||||||
local NEW_DOCKERFILE="$(fn-builder-dockerfile-computed-dockerfile-path "$APP")"
|
|
||||||
if [[ -n "$NEW_DOCKERFILE" ]]; then
|
|
||||||
if [[ ! -f "$NEW_DOCKERFILE" ]]; then
|
|
||||||
dokku_log_fail "Invalid dockerfile-path specified: $NEW_DOCKERFILE"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ "$NEW_DOCKERFILE" != "Dockerfile" ]]; then
|
|
||||||
mv "$NEW_DOCKERFILE" Dockerfile
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# extract first port from Dockerfile
|
# extract first port from Dockerfile
|
||||||
suppress_output dos2unix Dockerfile
|
suppress_output dos2unix Dockerfile
|
||||||
local DOCKERFILE_PORTS=$(get_dockerfile_exposed_ports Dockerfile)
|
local DOCKERFILE_PORTS=$(get_dockerfile_exposed_ports Dockerfile)
|
||||||
|
|||||||
32
plugins/builder-dockerfile/core-post-extract
Executable file
32
plugins/builder-dockerfile/core-post-extract
Executable file
@@ -0,0 +1,32 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
||||||
|
source "$PLUGIN_AVAILABLE_PATH/builder-dockerfile/internal-functions"
|
||||||
|
set -eo pipefail
|
||||||
|
[[ $DOKKU_TRACE ]] && set -x
|
||||||
|
|
||||||
|
trigger-builder-dockerfile-core-post-extract() {
|
||||||
|
declare desc="builder-dockerfile post-extract plugin trigger"
|
||||||
|
declare trigger="post-extract"
|
||||||
|
declare APP="$1" SOURCECODE_WORK_DIR="$2"
|
||||||
|
local NEW_DOCKERFILE="$(fn-builder-dockerfile-computed-dockerfile-path "$APP")"
|
||||||
|
|
||||||
|
pushd "$TMP_WORK_DIR" >/dev/null
|
||||||
|
|
||||||
|
if [[ -z "$NEW_DOCKERFILE" ]]; then
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ "$NEW_DOCKERFILE" == "Dockerfile" ]]; then
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ ! -f "$NEW_DOCKERFILE" ]]; then
|
||||||
|
dokku_log_fail "Invalid dockerfile-path specified: $NEW_DOCKERFILE"
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
mv "$NEW_DOCKERFILE" Dockerfile
|
||||||
|
popd &>/dev/null
|
||||||
|
}
|
||||||
|
|
||||||
|
trigger-builder-dockerfile-core-post-extract "$@"
|
||||||
Reference in New Issue
Block a user