这是indexloc提供的服务，不要输入任何密码
Skip to content

Fix custom dockerfile path detection #4836

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 6, 2021
Merged

Fix custom dockerfile path detection #4836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd28bf5
fix: move custom dockerfiles into place during the core-post-extract …
josegonzalez Oct 5, 2021
51c5c58
fix: do not attempt to move the Dockerfile if it is the default path
josegonzalez Oct 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions plugins/builder-dockerfile/builder-build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,6 @@ trigger-builder-dockerfile-builder-build() {

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
suppress_output dos2unix Dockerfile
local DOCKERFILE_PORTS=$(get_dockerfile_exposed_ports Dockerfile)
Expand Down
32 changes: 32 additions & 0 deletions plugins/builder-dockerfile/core-post-extract
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 "$@"