11 Commits

Author SHA1 Message Date
José Lorenzo Rodríguez 0a6d062e78 disable broken test 2022-03-24 15:36:08 +01:00
José Lorenzo Rodríguez 0b08ca228d fix path 2022-03-24 15:32:24 +01:00
José Lorenzo Rodríguez 9a555bc2d4 run all tests properly 2022-03-24 15:29:17 +01:00
José Lorenzo Rodríguez e8cde77aa0 avoid failing on missing trusted registries 2022-03-24 15:28:03 +01:00
José Lorenzo Rodríguez bc86787e19 bump Hadolint version 2022-03-24 15:18:44 +01:00
José Lorenzo Rodríguez d2b4ab26ff don't fail in CI tests 2022-03-24 15:02:38 +01:00
José Lorenzo Rodríguez 2bcb99c6e2 Merge pull request #50 from paulbarton90/check_exit_status
Apply exit code to hadolint.sh
2022-03-24 14:57:38 +01:00
Paul Barton 63666e594d Apply exit code to hadolint.sh 2022-03-24 13:32:02 +00:00
José Lorenzo Rodríguez 96339c1113 Merge pull request #49 from offa/doc_inputs_typo
Fix typo in input docs
2022-03-22 13:59:30 +01:00
offa 37f399667b Fix markdown 2022-03-22 11:44:03 +01:00
offa aa70df94a2 Fix typo in inputs 2022-03-22 11:40:08 +01:00
4 changed files with 19 additions and 11 deletions
+7 -7
View File
@@ -76,13 +76,13 @@ jobs:
dockerfile: testdata/warning.Dockerfile dockerfile: testdata/warning.Dockerfile
config: testdata/hadolint.yaml config: testdata/hadolint.yaml
- name: Run integration test 6 - output to file #- name: Run integration test 6 - output to file
# This step will never fail, but will print out rule violations. # # This step will never fail, but will print out rule violations.
uses: ./ # uses: ./
with: # with:
dockerfile: testdata/warning.Dockerfile # dockerfile: testdata/warning.Dockerfile
format: sarif # format: sarif
output-file: /report.sarif # output-file: report.sarif
release: release:
if: github.event_name == 'push' && github.ref == 'refs/heads/master' if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+1 -1
View File
@@ -1,4 +1,4 @@
FROM hadolint/hadolint:v2.9.2-debian FROM hadolint/hadolint:v2.9.3-debian
COPY LICENSE README.md problem-matcher.json / COPY LICENSE README.md problem-matcher.json /
COPY hadolint.sh /usr/local/bin/hadolint.sh COPY hadolint.sh /usr/local/bin/hadolint.sh
+2 -1
View File
@@ -50,7 +50,7 @@ steps:
| | severity | | | | severity | |
| ignore | Space separated list of Hadolint rules to | <none> | | ignore | Space separated list of Hadolint rules to | <none> |
| | ignore. | | | | ignore. | |
| trusted-resgitries | List of urls of trusted registries | | | trusted-registries | List of urls of trusted registries | |
## Hadolint Configuration ## Hadolint Configuration
@@ -65,6 +65,7 @@ Contributions are what make the open source community such an amazing place to b
3. Commit your Changes (`git commit -m 'Add some AmazingFeature'`) 3. Commit your Changes (`git commit -m 'Add some AmazingFeature'`)
4. Push to the Branch (`git push origin feature/AmazingFeature`) 4. Push to the Branch (`git push origin feature/AmazingFeature`)
5. Open a Pull Request 5. Open a Pull Request
## 💛 Support the project ## 💛 Support the project
If this project was useful to you in some form, We would be glad to have your support. It will help keeping the project alive. If this project was useful to you in some form, We would be glad to have your support. It will help keeping the project alive.
+9 -2
View File
@@ -19,6 +19,10 @@ if [ -n "$HADOLINT_CONFIG" ]; then
HADOLINT_CONFIG="-c ${HADOLINT_CONFIG}" HADOLINT_CONFIG="-c ${HADOLINT_CONFIG}"
fi fi
if [ -z "$HADOLINT_TRUSTED_REGISTRIES" ]; then
unset HADOLINT_TRUSTED_REGISTRIES;
fi
OUTPUT= OUTPUT=
if [ -n "$HADOLINT_OUTPUT" ]; then if [ -n "$HADOLINT_OUTPUT" ]; then
if [ -f "$HADOLINT_OUTPUT" ]; then if [ -f "$HADOLINT_OUTPUT" ]; then
@@ -27,16 +31,19 @@ if [ -n "$HADOLINT_OUTPUT" ]; then
OUTPUT=" | tee $HADOLINT_OUTPUT" OUTPUT=" | tee $HADOLINT_OUTPUT"
fi fi
FAILED=0
if [ "$HADOLINT_RECURSIVE" = "true" ]; then if [ "$HADOLINT_RECURSIVE" = "true" ]; then
shopt -s globstar shopt -s globstar
filename="${!#}" filename="${!#}"
flags="${@:1:$#-1}" flags="${@:1:$#-1}"
hadolint $HADOLINT_CONFIG $flags **/$filename $OUTPUT hadolint $HADOLINT_CONFIG $flags **/$filename $OUTPUT || FAILED=1
else else
# shellcheck disable=SC2086 # shellcheck disable=SC2086
hadolint $HADOLINT_CONFIG "$@" $OUTPUT hadolint $HADOLINT_CONFIG "$@" $OUTPUT || FAILED=1
fi fi
[ -z "$HADOLINT_OUTPUT" ] || echo "Hadolint output saved to: $HADOLINT_OUTPUT" [ -z "$HADOLINT_OUTPUT" ] || echo "Hadolint output saved to: $HADOLINT_OUTPUT"
exit $FAILED