[#1144] Added support for .env.local in docker-compose.

.drevops/docs/.utils/variables/extra/.env.local.default.variables.sh

@@ -14,9 +14,6 @@ DREVOPS_DB_DOWNLOAD_FORCE=
 # Set to `1` to print debug information in DrevOps scripts.
 DREVOPS_DEBUG=
 
-# Set to `1` to print debug information from Docker build.
-DREVOPS_DOCKER_VERBOSE=
-
 # Set to `y` to suppress Ahoy prompts.
 AHOY_CONFIRM_RESPONSE=
 

.drevops/docs/.utils/variables/extra/.env.variables.sh

@@ -44,9 +44,6 @@ DRUPAL_SITE_NAME="${DREVOPS_PROJECT}"
 # Used only when installing from profile.
 DRUPAL_SITE_EMAIL="[email protected]"
 
-# Print output from Docker build.
-DREVOPS_DOCKER_VERBOSE=1
-
 # Print output from Composer install.
 DREVOPS_COMPOSER_VERBOSE=1
 

.drevops/docs/content/workflows/variables.md

@@ -22,7 +22,7 @@ Defined in: `.env.local.default`
 
 ### `AHOY_CONFIRM_WAIT_SKIP`
 
-When Ahoy prompts are suppressed ([`$AHOY_CONFIRM`](#AHOY_CONFIRM_RESPONSE) is `1`), the command<br />will wait for `3` seconds before proceeding.<br />Set this variable to "`1`" to skip the wait.
+When Ahoy prompts are suppressed ([`$AHOY_CONFIRM_RESPONSE`](#AHOY_CONFIRM_RESPONSE) is `1`), the command<br />will wait for `3` seconds before proceeding.<br />Set this variable to "`1`" to skip the wait.
 
 Default value: `1`
 
@@ -685,14 +685,6 @@ Default value: `latest`
 
 Defined in: `scripts/drevops/deploy-docker.sh`
 
-### `DREVOPS_DOCKER_VERBOSE`
-
-Set to `1` to print debug information from Docker build.
-
-Default value: `UNDEFINED`
-
-Defined in: `.env.local.default`, `.env`
-
 ### `DREVOPS_DOCTOR_CHECK_BOOTSTRAP`
 
 Default value: `UNDEFINED`

.drevops/tests/bats/_helper.bash

@@ -144,9 +144,6 @@ setup() {
 
   # Allow to override debug variables from environment when developing tests.
   export DREVOPS_DEBUG="${TEST_DREVOPS_DEBUG:-}"
-  export DREVOPS_DOCKER_VERBOSE="${TEST_DREVOPS_DOCKER_VERBOSE:-}"
-  export DREVOPS_COMPOSER_VERBOSE="${TEST_DREVOPS_COMPOSER_VERBOSE:-}"
-  export DREVOPS_NPM_VERBOSE="${TEST_DREVOPS_NPM_VERBOSE:-}"
   export DREVOPS_INSTALL_DEBUG="${TEST_DREVOPS_INSTALL_DEBUG:-}"
 
   # Switch to using test demo DB.

.drevops/tests/bats/docker-compose.bats

@@ -73,6 +73,26 @@ load _helper.bash
   assert_files_equal docker-compose.actual.json docker-compose.env_mod.json
 }
 
+@test "Docker Compose: default with .env and .env.local" {
+  prepare_docker_compose
+
+  cp "${ROOT_DIR}/.env" .env
+  cp "${ROOT_DIR}/.env.local.default" .env.local
+
+  substep "Validate configuration"
+  run docker compose -f docker-compose.yml config
+  assert_success
+
+  substep "Compare with fixture"
+  prepare_docker_compose_fixtures
+
+  docker compose -f docker-compose.yml config --format json >docker-compose.actual.json
+  process_docker_compose_json docker-compose.actual.json
+  update_docker_compose_fixture "${PWD}"/docker-compose.actual.json docker-compose.env_local.json
+
+  assert_files_equal docker-compose.actual.json docker-compose.env_local.json
+}
+
 # Prepare current docker compose file for testing.
 prepare_docker_compose() {
   cp "${ROOT_DIR}/docker-compose.yml" docker-compose.yml
@@ -92,6 +112,7 @@ prepare_docker_compose_fixtures() {
   cp "${ROOT_DIR}/.drevops/tests/bats/fixtures/docker-compose.env.json" docker-compose.env.json
   cp "${ROOT_DIR}/.drevops/tests/bats/fixtures/docker-compose.env_mod.json" docker-compose.env_mod.json
   cp "${ROOT_DIR}/.drevops/tests/bats/fixtures/docker-compose.noenv.json" docker-compose.noenv.json
+  cp "${ROOT_DIR}/.drevops/tests/bats/fixtures/docker-compose.env_local.json" docker-compose.env_local.json
   replace_string_content "FIXTURE_CUR_DIR" "${CURRENT_PROJECT_DIR}" "${CURRENT_PROJECT_DIR}"
 
   # Replace symlink /private paths in MacOS.
@@ -127,6 +148,12 @@ process_docker_compose_json() {
       }
     });
 
+    array_walk_recursive(\$data, function (&\$value) {
+      if (\$value !== null && str_contains(\$value, \"$HOME\")) {
+        \$value = str_replace(\"$HOME\", 'HOME', \$value);
+      }
+    });
+
     \$data = json_encode(\$data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
 
     print \$data;