diff --git a/Dockerfile b/Dockerfile index 4088461c..1ff70db5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,7 +37,7 @@ ARG RAKUBREW_HOME=/tmp/rakubrew #################### # Run APK installs # #################### -RUN apk add --no-cache \ +RUN apk add --update --no-cache \ ansible-lint \ bash \ curl \ @@ -50,7 +50,7 @@ RUN apk add --no-cache \ make \ musl-dev \ npm \ - nodejs \ + nodejs-current \ openjdk8-jre \ perl \ php7 \ diff --git a/lib/linter.sh b/lib/linter.sh index 15424722..19715716 100755 --- a/lib/linter.sh +++ b/lib/linter.sh @@ -1071,7 +1071,7 @@ if [ "$VALIDATE_GROOVY" == "true" ]; then # Lint the groovy files # ######################### # LintCodebase "FILE_TYPE" "LINTER_NAME" "LINTER_CMD" "FILE_TYPES_REGEX" "FILE_ARRAY" - LintCodebase "GROOVY" "npm-groovy-lint" "npm-groovy-lint -c $GROOVY_LINTER_RULES -f" ".*\.\(groovy\|jenkinsfile\|gradle\)\$" "${FILE_ARRAY_GROOVY[@]}" + LintCodebase "GROOVY" "npm-groovy-lint" "npm-groovy-lint -c $GROOVY_LINTER_RULES -s" ".*\.\(groovy\|jenkinsfile\|gradle\)\$" "${FILE_ARRAY_GROOVY[@]}" fi ##################### diff --git a/lib/worker.sh b/lib/worker.sh index 792ae2fa..a1744219 100755 --- a/lib/worker.sh +++ b/lib/worker.sh @@ -483,7 +483,7 @@ function RunTestCases() { TestCodebase "PROTOBUF" "protolint" "protolint lint --config_path $PROTOBUF_LINTER_RULES" ".*\.\(proto\)\$" "protobuf" TestCodebase "OPENAPI" "spectral" "spectral lint -r $OPENAPI_LINTER_RULES" ".*\.\(ymlopenapi\|jsonopenapi\)\$" "openapi" TestCodebase "HTML" "htmlhint" "htmlhint --config $HTML_LINTER_RULES" ".*\.\(html\)\$" "html" - TestCodebase "GROOVY" "npm-groovy-lint" "npm-groovy-lint -c $GROOVY_LINTER_RULES -f" ".*\.\(groovy\|jenkinsfile\|gradle\)\$" "groovy" + TestCodebase "GROOVY" "npm-groovy-lint" "npm-groovy-lint -c $GROOVY_LINTER_RULES -s" ".*\.\(groovy\|jenkinsfile\|gradle\)\$" "groovy" ################# # Footer prints #