Skip to content

Commit

Permalink
Revert "Fix the issue of ignoring the provided context value"
Browse files Browse the repository at this point in the history
This reverts commit 2cfb27a.
  • Loading branch information
savitaashture authored and vdemeester committed Jan 15, 2025
1 parent 1095acb commit 5252a25
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions scripts/buildah-common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,9 @@ declare -rx RESULTS_IMAGE_URL_PATH="${RESULTS_IMAGE_URL_PATH:-}"

# exposing the full path to the container file, which by default should be relative to the primary
# workspace, to receive a different container-file location

# Addresses the issue of ignoring context values when they are provided where `.` is a default value
if [ -n "$PARAMS_CONTEXT" ] && [ "$PARAMS_CONTEXT" != "." ]; then
declare -r dockerfile_on_ws="${WORKSPACES_SOURCE_PATH}/${PARAMS_CONTEXT}/${PARAMS_DOCKERFILE}"
else
declare -r dockerfile_on_ws="${WORKSPACES_SOURCE_PATH}/${PARAMS_DOCKERFILE}"
fi
declare -r dockerfile_on_ws="${WORKSPACES_SOURCE_PATH}/${PARAMS_DOCKERFILE}"
declare -x DOCKERFILE_FULL="${DOCKERFILE_FULL:-${dockerfile_on_ws}}"

#
# Asserting Environment
#
Expand Down

0 comments on commit 5252a25

Please sign in to comment.