mirror of
https://github.com/hadolint/hadolint-action.git
synced 2026-09-04 14:39:28 +00:00
Revert "Some shellcheck fixes and new input to print Hadolint results to console"
This commit is contained in:
+9
-16
@@ -3,10 +3,7 @@
|
||||
# The problem-matcher definition must be present in the repository
|
||||
# checkout (outside the Docker container running hadolint). We copy
|
||||
# problem-matcher.json to the home folder.
|
||||
PROBLEM_MATCHER_FILE="/problem-matcher.json"
|
||||
if [ -f "$PROBLEM_MATCHER_FILE" ]; then
|
||||
cp "$PROBLEM_MATCHER_FILE" "$HOME/"
|
||||
fi
|
||||
cp /problem-matcher.json "$HOME/"
|
||||
|
||||
# After the run has finished we remove the problem-matcher.json from
|
||||
# the repository so we don't leave the checkout dirty. We also remove
|
||||
@@ -26,18 +23,16 @@ if [ -z "$HADOLINT_TRUSTED_REGISTRIES" ]; then
|
||||
unset HADOLINT_TRUSTED_REGISTRIES;
|
||||
fi
|
||||
|
||||
COMMAND="hadolint $HADOLINT_CONFIG"
|
||||
|
||||
if [ "$HADOLINT_RECURSIVE" = "true" ]; then
|
||||
shopt -s globstar
|
||||
|
||||
filename="${!#}"
|
||||
flags="${@:1:$#-1}"
|
||||
|
||||
RESULTS=$(eval "$COMMAND $flags" -- **/$filename)
|
||||
RESULTS=$(hadolint $HADOLINT_CONFIG $flags **/$filename)
|
||||
else
|
||||
|
||||
RESULTS=$(eval "$COMMAND" "$@")
|
||||
# shellcheck disable=SC2086
|
||||
RESULTS=$(hadolint $HADOLINT_CONFIG "$@")
|
||||
fi
|
||||
FAILED=$?
|
||||
|
||||
@@ -45,18 +40,16 @@ if [ -n "$HADOLINT_OUTPUT" ]; then
|
||||
if [ -f "$HADOLINT_OUTPUT" ]; then
|
||||
HADOLINT_OUTPUT="$TMP_FOLDER/$HADOLINT_OUTPUT"
|
||||
fi
|
||||
echo "$RESULTS" > "$HADOLINT_OUTPUT"
|
||||
fi
|
||||
|
||||
if [ "$HADOLINT_RESULTS_TO_CONSOLE" = "true" ]; then
|
||||
echo "$RESULTS"
|
||||
echo "$RESULTS" > $HADOLINT_OUTPUT
|
||||
fi
|
||||
|
||||
RESULTS="${RESULTS//$'\\n'/''}"
|
||||
|
||||
{ echo "results<<EOF"; echo "$RESULTS"; echo "EOF"; } >> "$GITHUB_OUTPUT"
|
||||
echo "results<<EOF" >> $GITHUB_OUTPUT
|
||||
echo "${RESULTS}" >> $GITHUB_OUTPUT
|
||||
echo "EOF" >> $GITHUB_OUTPUT
|
||||
|
||||
{ echo "HADOLINT_RESULTS<<EOF"; echo "$RESULTS"; echo "EOF"; } >> "$GITHUB_ENV"
|
||||
{ echo "HADOLINT_RESULTS<<EOF"; echo "$RESULTS"; echo "EOF"; } >> $GITHUB_ENV
|
||||
|
||||
[ -z "$HADOLINT_OUTPUT" ] || echo "Hadolint output saved to: $HADOLINT_OUTPUT"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user