diff --git a/scripts/validate/govcms-validate-platform-yml b/scripts/validate/govcms-validate-platform-yml index e14d162e..4d25a21d 100755 --- a/scripts/validate/govcms-validate-platform-yml +++ b/scripts/validate/govcms-validate-platform-yml @@ -19,7 +19,7 @@ function join_char { local IFS="$1" shift; echo "$*"; } echo "GovCMS Validate :: Yaml lint platform files" if [ -z "${GOVCMS_PLATFORM_FILES}" ]; then - GOVCMS_PLATFORM_FILES=$(find . -type f \( -name '.lagoon.yml' \)) + GOVCMS_PLATFORM_FILES=$(find . -type f \( -name '.lagoon.yml' -o -name 'docker-compose.yml' \)) fi if [ -z "${GOVCMS_YAML_LINT}" ]; then diff --git a/tests/bats/settings/environments.bats b/tests/bats/settings/environments.bats index e055e49a..7172986d 100644 --- a/tests/bats/settings/environments.bats +++ b/tests/bats/settings/environments.bats @@ -52,6 +52,7 @@ settings() { [ "$(echo "$FILES" | jq '. | has("lagoon.settings.php")')" == "false" ] [ "$(echo "$FILES" | jq '. | has("production.settings.php")')" == "false" ] [ "$(echo "$FILES" | jq '. | has("development.settings.php")')" == "true" ] + [ "$(echo "$FILES" | jq '. | has("dev-mode.settings.php")')" == "true" ] } @test "Correct includes in dev mode (lagoon image)" { @@ -67,6 +68,7 @@ settings() { [ "$(echo "$FILES" | jq '. | has("lagoon.settings.php")')" == "true" ] [ "$(echo "$FILES" | jq '. | has("production.settings.php")')" == "false" ] [ "$(echo "$FILES" | jq '. | has("development.settings.php")')" == "true" ] + [ "$(echo "$FILES" | jq '. | has("dev-mode.settings.php")')" == "true" ] } @test "Correct includes in production mode (not lagoon)" {