diff --git a/Dockerfile b/Dockerfile index 98b7a3e2..226c030e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -269,8 +269,8 @@ ENV ACTIONS_RUNNER_DEBUG=${ACTIONS_RUNNER_DEBUG} \ VALIDATE_COFFEE=${VALIDATE_COFFEE} \ VALIDATE_CSS=${VALIDATE_CSS} \ VALIDATE_DART=${VALIDATE_DART} \ - VALIDATE_DOCKER=${VALIDATE_DOCKER} \ - VALIDATE_DOCKER_HADOLINT=${VALIDATE_DOCKER_HADOLINT} \ + VALIDATE_DOCKERFILE=${VALIDATE_DOCKERFILE} \ + VALIDATE_DOCKERFILE_HADOLINT=${VALIDATE_DOCKERFILE_HADOLINT} \ VALIDATE_EDITORCONFIG=${VALIDATE_EDITORCONFIG} \ VALIDATE_ENV=${VALIDATE_ENV} \ VALIDATE_GO=${VALIDATE_GO} \ diff --git a/README.md b/README.md index 324a5aae..295826a1 100644 --- a/README.md +++ b/README.md @@ -200,8 +200,8 @@ But if you wish to select or exclude specific linters, we give you full control | **VALIDATE_COFFEE** | `true` | Flag to enable or disable the linting process of the Coffeescript language . | | **VALIDATE_CSS** | `true` | Flag to enable or disable the linting process of the CSS language. | | **VALIDATE_DART** | `true` | Flag to enable or disable the linting process of the Dart language. | -| **VALIDATE_DOCKER** | `true` | Flag to enable or disable the linting process of the Docker language. | -| **VALIDATE_DOCKER_HADOLINT** | `true` | Flag to enable or disable the linting process of the Docker language. | +| **VALIDATE_DOCKERFILE** | `true` | Flag to enable or disable the linting process of the Docker language. | +| **VALIDATE_DOCKERFILE_HADOLINT** | `true` | Flag to enable or disable the linting process of the Docker language. | | **VALIDATE_EDITORCONFIG** | `true` | Flag to enable or disable the linting process with the editorconfig. | | **VALIDATE_ENV** | `true` | Flag to enable or disable the linting process of the ENV language. | | **VALIDATE_GO** | `true` | Flag to enable or disable the linting process of the Golang language. | diff --git a/lib/linter.sh b/lib/linter.sh index ab5c4d0f..9912e1a2 100755 --- a/lib/linter.sh +++ b/lib/linter.sh @@ -173,8 +173,8 @@ VALIDATE_CLOJURE="${VALIDATE_CLOJURE}" # Boolean t VALIDATE_COFFEE="${VALIDATE_COFFEE}" # Boolean to validate language VALIDATE_CSS="${VALIDATE_CSS}" # Boolean to validate language VALIDATE_DART="${VALIDATE_DART}" # Boolean to validate language -VALIDATE_DOCKER="${VALIDATE_DOCKER}" # Boolean to validate language -VALIDATE_DOCKER_HADOLINT="${VALIDATE_DOCKER_HADOLINT}" # Boolean to validate language +VALIDATE_DOCKERFILE="${VALIDATE_DOCKERFILE}" # Boolean to validate language +VALIDATE_DOCKERFILE_HADOLINT="${VALIDATE_DOCKERFILE_HADOLINT}" # Boolean to validate language VALIDATE_EDITORCONFIG="${VALIDATE_EDITORCONFIG}" # Boolean to validate files with editorconfig VALIDATE_ENV="${VALIDATE_ENV}" # Boolean to validate language VALIDATE_GO="${VALIDATE_GO}" # Boolean to validate language @@ -1381,7 +1381,7 @@ fi ################## # DOCKER LINTING # ################## -if [ "${VALIDATE_DOCKER}" == "true" ]; then +if [ "${VALIDATE_DOCKERFILE}" == "true" ]; then ######################### # Lint the docker files # ######################### @@ -1393,7 +1393,7 @@ fi ########################### # DOCKER LINTING HADOLINT # ########################### -if [ "${VALIDATE_DOCKER_HADOLINT}" == "true" ]; then +if [ "${VALIDATE_DOCKERFILE_HADOLINT}" == "true" ]; then ######################### # Lint the docker files # #########################