From 8f6fde1bbfc7fed6946cf46b398058116253c896 Mon Sep 17 00:00:00 2001 From: Ahmed Jabar Date: Fri, 22 Jan 2021 09:56:23 +1100 Subject: [PATCH 1/2] [GOVCMSD8-709] Lint docker-compose.yml. --- scripts/validate/govcms-validate-platform-yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From facab1e30c0da6e5d062ee75f62cf84006047ede Mon Sep 17 00:00:00 2001 From: Ahmed Jabar Date: Tue, 26 Jan 2021 18:28:05 +1100 Subject: [PATCH 2/2] Fix dev-mode in tests. --- tests/bats/settings/environments.bats | 2 ++ 1 file changed, 2 insertions(+) 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)" {