diff --git a/templates/gitlab-ci-docker.yml b/templates/gitlab-ci-docker.yml index a4bd2f04205542e0b14c672d8eb26855ee8298ff..080a7b2a01613b8724d32c19271ebce1e577b58c 100644 --- a/templates/gitlab-ci-docker.yml +++ b/templates/gitlab-ci-docker.yml @@ -313,10 +313,11 @@ stages: # autodetects whether there is an hadolint config file function autoconfig_hadolint() { # If present, import hadolint config found inside the git repository - if [[ -f "hadolint.yaml" ]] + _cfg=$(ls -1 "hadolint.yaml" 2>/dev/null || ls -1 ".hadolint.yaml" 2>/dev/null || echo "") + if [[ -f "$_cfg" ]] then - log_info "Using custom Hadolint config (\\e[33;1mhadolint.yaml\\e[0m)" - export hadolint_config_opts="--config ./hadolint.yaml" + log_info "Using custom Hadolint config (\\e[33;1m${_cfg}\\e[0m)" + export hadolint_config_opts="--config $_cfg" else log_info "No Hadolint config found: use default" fi