From 47fd47b857387edfbd8a052171de7a11da5c6a55 Mon Sep 17 00:00:00 2001 From: Alex Skrypnyk Date: Fri, 26 Apr 2024 07:44:09 +1000 Subject: [PATCH] [#1286] Removed support for `.env.local` from `docker-compose.yml`. (#1287) --- .../bats/fixtures/docker-compose.env.json | 210 -------------- .../fixtures/docker-compose.env_local.json | 266 ------------------ .../bats/fixtures/docker-compose.env_mod.json | 224 --------------- docker-compose.yml | 19 +- 4 files changed, 5 insertions(+), 714 deletions(-) diff --git a/.scaffold/tests/bats/fixtures/docker-compose.env.json b/.scaffold/tests/bats/fixtures/docker-compose.env.json index 6fb2088be..0b8db3844 100644 --- a/.scaffold/tests/bats/fixtures/docker-compose.env.json +++ b/.scaffold/tests/bats/fixtures/docker-compose.env.json @@ -23,41 +23,11 @@ "entrypoint": null, "environment": { "CI": "true", - "DREVOPS_ACQUIA_APP_NAME": "", - "DREVOPS_DB_DIR": "./.data", - "DREVOPS_DB_DOWNLOAD_ACQUIA_DB_NAME": "your_site", - "DREVOPS_DB_DOWNLOAD_CURL_URL": "https://github.com/drevops/scaffold/releases/download/1.18.0/db_d10.demo.sql", - "DREVOPS_DB_DOWNLOAD_ENVIRONMENT": "prod", - "DREVOPS_DB_DOWNLOAD_FTP_FILE": "db.sql", - "DREVOPS_DB_DOWNLOAD_FTP_HOST": "", - "DREVOPS_DB_DOWNLOAD_FTP_PORT": "21", - "DREVOPS_DB_DOWNLOAD_SOURCE": "curl", - "DREVOPS_DB_FILE": "db.sql", - "DREVOPS_DEPLOY_TYPES": "artifact", - "DREVOPS_LAGOON_PRODUCTION_BRANCH": "main", "DREVOPS_LOCALDEV_URL": "star_wars.docker.amazee.io", - "DREVOPS_NOTIFY_CHANNELS": "email", - "DREVOPS_NOTIFY_EMAIL_FROM": "webmaster@your-site-url.example", - "DREVOPS_NOTIFY_EMAIL_RECIPIENTS": "webmaster@your-site-url.example", - "DREVOPS_PROJECT": "your_site", - "DREVOPS_PROVISION_OVERRIDE_DB": "0", - "DREVOPS_PROVISION_SANITIZE_DB_EMAIL": "user_%uid@your-site-url.example", - "DREVOPS_PROVISION_SANITIZE_DB_SKIP": "0", - "DREVOPS_PROVISION_USE_MAINTENANCE_MODE": "1", - "DREVOPS_PROVISION_USE_PROFILE": "0", - "DREVOPS_TZ": "Australia/Melbourne", - "DREVOPS_WEBROOT": "web", - "DRUPAL_CLAMAV_ENABLED": "1", - "DRUPAL_CLAMAV_MODE": "daemon", - "DRUPAL_PROFILE": "standard", "DRUPAL_REDIS_ENABLED": "0", "DRUPAL_SHIELD_PASS": "", - "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", - "DRUPAL_THEME": "your_site_theme", "LAGOON_ENVIRONMENT_TYPE": "local", - "LAGOON_PROJECT": "your_site", "LAGOON_ROUTE": "star_wars.docker.amazee.io", "MARIADB_DATABASE": "drupal", "MARIADB_HOST": "mariadb", @@ -96,41 +66,11 @@ "entrypoint": null, "environment": { "CI": "true", - "DREVOPS_ACQUIA_APP_NAME": "", - "DREVOPS_DB_DIR": "./.data", - "DREVOPS_DB_DOWNLOAD_ACQUIA_DB_NAME": "your_site", - "DREVOPS_DB_DOWNLOAD_CURL_URL": "https://github.com/drevops/scaffold/releases/download/1.18.0/db_d10.demo.sql", - "DREVOPS_DB_DOWNLOAD_ENVIRONMENT": "prod", - "DREVOPS_DB_DOWNLOAD_FTP_FILE": "db.sql", - "DREVOPS_DB_DOWNLOAD_FTP_HOST": "", - "DREVOPS_DB_DOWNLOAD_FTP_PORT": "21", - "DREVOPS_DB_DOWNLOAD_SOURCE": "curl", - "DREVOPS_DB_FILE": "db.sql", - "DREVOPS_DEPLOY_TYPES": "artifact", - "DREVOPS_LAGOON_PRODUCTION_BRANCH": "main", "DREVOPS_LOCALDEV_URL": "star_wars.docker.amazee.io", - "DREVOPS_NOTIFY_CHANNELS": "email", - "DREVOPS_NOTIFY_EMAIL_FROM": "webmaster@your-site-url.example", - "DREVOPS_NOTIFY_EMAIL_RECIPIENTS": "webmaster@your-site-url.example", - "DREVOPS_PROJECT": "your_site", - "DREVOPS_PROVISION_OVERRIDE_DB": "0", - "DREVOPS_PROVISION_SANITIZE_DB_EMAIL": "user_%uid@your-site-url.example", - "DREVOPS_PROVISION_SANITIZE_DB_SKIP": "0", - "DREVOPS_PROVISION_USE_MAINTENANCE_MODE": "1", - "DREVOPS_PROVISION_USE_PROFILE": "0", - "DREVOPS_TZ": "Australia/Melbourne", - "DREVOPS_WEBROOT": "web", - "DRUPAL_CLAMAV_ENABLED": "1", - "DRUPAL_CLAMAV_MODE": "daemon", - "DRUPAL_PROFILE": "standard", "DRUPAL_REDIS_ENABLED": "0", "DRUPAL_SHIELD_PASS": "", - "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", - "DRUPAL_THEME": "your_site_theme", "LAGOON_ENVIRONMENT_TYPE": "local", - "LAGOON_PROJECT": "your_site", "LAGOON_ROUTE": "star_wars.docker.amazee.io", "MARIADB_DATABASE": "drupal", "MARIADB_HOST": "mariadb", @@ -171,41 +111,11 @@ "entrypoint": null, "environment": { "CI": "true", - "DREVOPS_ACQUIA_APP_NAME": "", - "DREVOPS_DB_DIR": "./.data", - "DREVOPS_DB_DOWNLOAD_ACQUIA_DB_NAME": "your_site", - "DREVOPS_DB_DOWNLOAD_CURL_URL": "https://github.com/drevops/scaffold/releases/download/1.18.0/db_d10.demo.sql", - "DREVOPS_DB_DOWNLOAD_ENVIRONMENT": "prod", - "DREVOPS_DB_DOWNLOAD_FTP_FILE": "db.sql", - "DREVOPS_DB_DOWNLOAD_FTP_HOST": "", - "DREVOPS_DB_DOWNLOAD_FTP_PORT": "21", - "DREVOPS_DB_DOWNLOAD_SOURCE": "curl", - "DREVOPS_DB_FILE": "db.sql", - "DREVOPS_DEPLOY_TYPES": "artifact", - "DREVOPS_LAGOON_PRODUCTION_BRANCH": "main", "DREVOPS_LOCALDEV_URL": "star_wars.docker.amazee.io", - "DREVOPS_NOTIFY_CHANNELS": "email", - "DREVOPS_NOTIFY_EMAIL_FROM": "webmaster@your-site-url.example", - "DREVOPS_NOTIFY_EMAIL_RECIPIENTS": "webmaster@your-site-url.example", - "DREVOPS_PROJECT": "your_site", - "DREVOPS_PROVISION_OVERRIDE_DB": "0", - "DREVOPS_PROVISION_SANITIZE_DB_EMAIL": "user_%uid@your-site-url.example", - "DREVOPS_PROVISION_SANITIZE_DB_SKIP": "0", - "DREVOPS_PROVISION_USE_MAINTENANCE_MODE": "1", - "DREVOPS_PROVISION_USE_PROFILE": "0", - "DREVOPS_TZ": "Australia/Melbourne", - "DREVOPS_WEBROOT": "web", - "DRUPAL_CLAMAV_ENABLED": "1", - "DRUPAL_CLAMAV_MODE": "daemon", - "DRUPAL_PROFILE": "standard", "DRUPAL_REDIS_ENABLED": "0", "DRUPAL_SHIELD_PASS": "", - "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", - "DRUPAL_THEME": "your_site_theme", "LAGOON_ENVIRONMENT_TYPE": "local", - "LAGOON_PROJECT": "your_site", "LAGOON_ROUTE": "star_wars.docker.amazee.io", "MARIADB_DATABASE": "drupal", "MARIADB_HOST": "mariadb", @@ -253,41 +163,11 @@ "entrypoint": null, "environment": { "CI": "true", - "DREVOPS_ACQUIA_APP_NAME": "", - "DREVOPS_DB_DIR": "./.data", - "DREVOPS_DB_DOWNLOAD_ACQUIA_DB_NAME": "your_site", - "DREVOPS_DB_DOWNLOAD_CURL_URL": "https://github.com/drevops/scaffold/releases/download/1.18.0/db_d10.demo.sql", - "DREVOPS_DB_DOWNLOAD_ENVIRONMENT": "prod", - "DREVOPS_DB_DOWNLOAD_FTP_FILE": "db.sql", - "DREVOPS_DB_DOWNLOAD_FTP_HOST": "", - "DREVOPS_DB_DOWNLOAD_FTP_PORT": "21", - "DREVOPS_DB_DOWNLOAD_SOURCE": "curl", - "DREVOPS_DB_FILE": "db.sql", - "DREVOPS_DEPLOY_TYPES": "artifact", - "DREVOPS_LAGOON_PRODUCTION_BRANCH": "main", "DREVOPS_LOCALDEV_URL": "star_wars.docker.amazee.io", - "DREVOPS_NOTIFY_CHANNELS": "email", - "DREVOPS_NOTIFY_EMAIL_FROM": "webmaster@your-site-url.example", - "DREVOPS_NOTIFY_EMAIL_RECIPIENTS": "webmaster@your-site-url.example", - "DREVOPS_PROJECT": "your_site", - "DREVOPS_PROVISION_OVERRIDE_DB": "0", - "DREVOPS_PROVISION_SANITIZE_DB_EMAIL": "user_%uid@your-site-url.example", - "DREVOPS_PROVISION_SANITIZE_DB_SKIP": "0", - "DREVOPS_PROVISION_USE_MAINTENANCE_MODE": "1", - "DREVOPS_PROVISION_USE_PROFILE": "0", - "DREVOPS_TZ": "Australia/Melbourne", - "DREVOPS_WEBROOT": "web", - "DRUPAL_CLAMAV_ENABLED": "1", - "DRUPAL_CLAMAV_MODE": "daemon", - "DRUPAL_PROFILE": "standard", "DRUPAL_REDIS_ENABLED": "0", "DRUPAL_SHIELD_PASS": "", - "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", - "DRUPAL_THEME": "your_site_theme", "LAGOON_ENVIRONMENT_TYPE": "local", - "LAGOON_PROJECT": "your_site", "LAGOON_ROUTE": "star_wars.docker.amazee.io", "MARIADB_DATABASE": "drupal", "MARIADB_HOST": "mariadb", @@ -332,41 +212,11 @@ "entrypoint": null, "environment": { "CI": "true", - "DREVOPS_ACQUIA_APP_NAME": "", - "DREVOPS_DB_DIR": "./.data", - "DREVOPS_DB_DOWNLOAD_ACQUIA_DB_NAME": "your_site", - "DREVOPS_DB_DOWNLOAD_CURL_URL": "https://github.com/drevops/scaffold/releases/download/1.18.0/db_d10.demo.sql", - "DREVOPS_DB_DOWNLOAD_ENVIRONMENT": "prod", - "DREVOPS_DB_DOWNLOAD_FTP_FILE": "db.sql", - "DREVOPS_DB_DOWNLOAD_FTP_HOST": "", - "DREVOPS_DB_DOWNLOAD_FTP_PORT": "21", - "DREVOPS_DB_DOWNLOAD_SOURCE": "curl", - "DREVOPS_DB_FILE": "db.sql", - "DREVOPS_DEPLOY_TYPES": "artifact", - "DREVOPS_LAGOON_PRODUCTION_BRANCH": "main", "DREVOPS_LOCALDEV_URL": "star_wars.docker.amazee.io", - "DREVOPS_NOTIFY_CHANNELS": "email", - "DREVOPS_NOTIFY_EMAIL_FROM": "webmaster@your-site-url.example", - "DREVOPS_NOTIFY_EMAIL_RECIPIENTS": "webmaster@your-site-url.example", - "DREVOPS_PROJECT": "your_site", - "DREVOPS_PROVISION_OVERRIDE_DB": "0", - "DREVOPS_PROVISION_SANITIZE_DB_EMAIL": "user_%uid@your-site-url.example", - "DREVOPS_PROVISION_SANITIZE_DB_SKIP": "0", - "DREVOPS_PROVISION_USE_MAINTENANCE_MODE": "1", - "DREVOPS_PROVISION_USE_PROFILE": "0", - "DREVOPS_TZ": "Australia/Melbourne", - "DREVOPS_WEBROOT": "web", - "DRUPAL_CLAMAV_ENABLED": "1", - "DRUPAL_CLAMAV_MODE": "daemon", - "DRUPAL_PROFILE": "standard", "DRUPAL_REDIS_ENABLED": "0", "DRUPAL_SHIELD_PASS": "", - "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", - "DRUPAL_THEME": "your_site_theme", "LAGOON_ENVIRONMENT_TYPE": "local", - "LAGOON_PROJECT": "your_site", "LAGOON_ROUTE": "star_wars.docker.amazee.io", "MARIADB_DATABASE": "drupal", "MARIADB_HOST": "mariadb", @@ -421,41 +271,11 @@ "entrypoint": null, "environment": { "CI": "true", - "DREVOPS_ACQUIA_APP_NAME": "", - "DREVOPS_DB_DIR": "./.data", - "DREVOPS_DB_DOWNLOAD_ACQUIA_DB_NAME": "your_site", - "DREVOPS_DB_DOWNLOAD_CURL_URL": "https://github.com/drevops/scaffold/releases/download/1.18.0/db_d10.demo.sql", - "DREVOPS_DB_DOWNLOAD_ENVIRONMENT": "prod", - "DREVOPS_DB_DOWNLOAD_FTP_FILE": "db.sql", - "DREVOPS_DB_DOWNLOAD_FTP_HOST": "", - "DREVOPS_DB_DOWNLOAD_FTP_PORT": "21", - "DREVOPS_DB_DOWNLOAD_SOURCE": "curl", - "DREVOPS_DB_FILE": "db.sql", - "DREVOPS_DEPLOY_TYPES": "artifact", - "DREVOPS_LAGOON_PRODUCTION_BRANCH": "main", "DREVOPS_LOCALDEV_URL": "star_wars.docker.amazee.io", - "DREVOPS_NOTIFY_CHANNELS": "email", - "DREVOPS_NOTIFY_EMAIL_FROM": "webmaster@your-site-url.example", - "DREVOPS_NOTIFY_EMAIL_RECIPIENTS": "webmaster@your-site-url.example", - "DREVOPS_PROJECT": "your_site", - "DREVOPS_PROVISION_OVERRIDE_DB": "0", - "DREVOPS_PROVISION_SANITIZE_DB_EMAIL": "user_%uid@your-site-url.example", - "DREVOPS_PROVISION_SANITIZE_DB_SKIP": "0", - "DREVOPS_PROVISION_USE_MAINTENANCE_MODE": "1", - "DREVOPS_PROVISION_USE_PROFILE": "0", - "DREVOPS_TZ": "Australia/Melbourne", - "DREVOPS_WEBROOT": "web", - "DRUPAL_CLAMAV_ENABLED": "1", - "DRUPAL_CLAMAV_MODE": "daemon", - "DRUPAL_PROFILE": "standard", "DRUPAL_REDIS_ENABLED": "0", "DRUPAL_SHIELD_PASS": "", - "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", - "DRUPAL_THEME": "your_site_theme", "LAGOON_ENVIRONMENT_TYPE": "local", - "LAGOON_PROJECT": "your_site", "LAGOON_ROUTE": "star_wars.docker.amazee.io", "MARIADB_DATABASE": "drupal", "MARIADB_HOST": "mariadb", @@ -520,41 +340,11 @@ "entrypoint": null, "environment": { "CI": "true", - "DREVOPS_ACQUIA_APP_NAME": "", - "DREVOPS_DB_DIR": "./.data", - "DREVOPS_DB_DOWNLOAD_ACQUIA_DB_NAME": "your_site", - "DREVOPS_DB_DOWNLOAD_CURL_URL": "https://github.com/drevops/scaffold/releases/download/1.18.0/db_d10.demo.sql", - "DREVOPS_DB_DOWNLOAD_ENVIRONMENT": "prod", - "DREVOPS_DB_DOWNLOAD_FTP_FILE": "db.sql", - "DREVOPS_DB_DOWNLOAD_FTP_HOST": "", - "DREVOPS_DB_DOWNLOAD_FTP_PORT": "21", - "DREVOPS_DB_DOWNLOAD_SOURCE": "curl", - "DREVOPS_DB_FILE": "db.sql", - "DREVOPS_DEPLOY_TYPES": "artifact", - "DREVOPS_LAGOON_PRODUCTION_BRANCH": "main", "DREVOPS_LOCALDEV_URL": "star_wars.docker.amazee.io", - "DREVOPS_NOTIFY_CHANNELS": "email", - "DREVOPS_NOTIFY_EMAIL_FROM": "webmaster@your-site-url.example", - "DREVOPS_NOTIFY_EMAIL_RECIPIENTS": "webmaster@your-site-url.example", - "DREVOPS_PROJECT": "your_site", - "DREVOPS_PROVISION_OVERRIDE_DB": "0", - "DREVOPS_PROVISION_SANITIZE_DB_EMAIL": "user_%uid@your-site-url.example", - "DREVOPS_PROVISION_SANITIZE_DB_SKIP": "0", - "DREVOPS_PROVISION_USE_MAINTENANCE_MODE": "1", - "DREVOPS_PROVISION_USE_PROFILE": "0", - "DREVOPS_TZ": "Australia/Melbourne", - "DREVOPS_WEBROOT": "web", - "DRUPAL_CLAMAV_ENABLED": "1", - "DRUPAL_CLAMAV_MODE": "daemon", - "DRUPAL_PROFILE": "standard", "DRUPAL_REDIS_ENABLED": "0", "DRUPAL_SHIELD_PASS": "", - "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", - "DRUPAL_THEME": "your_site_theme", "LAGOON_ENVIRONMENT_TYPE": "local", - "LAGOON_PROJECT": "your_site", "LAGOON_ROUTE": "star_wars.docker.amazee.io", "MARIADB_DATABASE": "drupal", "MARIADB_HOST": "mariadb", diff --git a/.scaffold/tests/bats/fixtures/docker-compose.env_local.json b/.scaffold/tests/bats/fixtures/docker-compose.env_local.json index 512425b03..0b8db3844 100644 --- a/.scaffold/tests/bats/fixtures/docker-compose.env_local.json +++ b/.scaffold/tests/bats/fixtures/docker-compose.env_local.json @@ -23,49 +23,11 @@ "entrypoint": null, "environment": { "CI": "true", - "DOCKER_PASS": "", - "DOCKER_USER": "", - "DREVOPS_ACQUIA_APP_NAME": "", - "DREVOPS_ACQUIA_KEY": "", - "DREVOPS_ACQUIA_SECRET": "", - "DREVOPS_DB_DIR": "./.data", - "DREVOPS_DB_DOWNLOAD_ACQUIA_DB_NAME": "your_site", - "DREVOPS_DB_DOWNLOAD_CURL_URL": "https://github.com/drevops/scaffold/releases/download/1.18.0/db_d10.demo.sql", - "DREVOPS_DB_DOWNLOAD_ENVIRONMENT": "prod", - "DREVOPS_DB_DOWNLOAD_FORCE": "1", - "DREVOPS_DB_DOWNLOAD_FTP_FILE": "db.sql", - "DREVOPS_DB_DOWNLOAD_FTP_HOST": "", - "DREVOPS_DB_DOWNLOAD_FTP_PASS": "", - "DREVOPS_DB_DOWNLOAD_FTP_PORT": "21", - "DREVOPS_DB_DOWNLOAD_FTP_USER": "", - "DREVOPS_DB_DOWNLOAD_SOURCE": "curl", - "DREVOPS_DB_FILE": "db.sql", - "DREVOPS_DEPLOY_TYPES": "artifact", - "DREVOPS_LAGOON_PRODUCTION_BRANCH": "main", "DREVOPS_LOCALDEV_URL": "star_wars.docker.amazee.io", - "DREVOPS_NOTIFY_CHANNELS": "email", - "DREVOPS_NOTIFY_EMAIL_FROM": "webmaster@your-site-url.example", - "DREVOPS_NOTIFY_EMAIL_RECIPIENTS": "webmaster@your-site-url.example", - "DREVOPS_PROJECT": "your_site", - "DREVOPS_PROVISION_OVERRIDE_DB": "1", - "DREVOPS_PROVISION_SANITIZE_DB_EMAIL": "user_%uid@your-site-url.example", - "DREVOPS_PROVISION_SANITIZE_DB_SKIP": "0", - "DREVOPS_PROVISION_USE_MAINTENANCE_MODE": "1", - "DREVOPS_PROVISION_USE_PROFILE": "0", - "DREVOPS_TZ": "Australia/Melbourne", - "DREVOPS_WEBROOT": "web", - "DRUPAL_CLAMAV_ENABLED": "1", - "DRUPAL_CLAMAV_MODE": "daemon", - "DRUPAL_PROFILE": "standard", "DRUPAL_REDIS_ENABLED": "0", "DRUPAL_SHIELD_PASS": "", - "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", - "DRUPAL_THEME": "your_site_theme", - "GITHUB_TOKEN": "", "LAGOON_ENVIRONMENT_TYPE": "local", - "LAGOON_PROJECT": "your_site", "LAGOON_ROUTE": "star_wars.docker.amazee.io", "MARIADB_DATABASE": "drupal", "MARIADB_HOST": "mariadb", @@ -104,49 +66,11 @@ "entrypoint": null, "environment": { "CI": "true", - "DOCKER_PASS": "", - "DOCKER_USER": "", - "DREVOPS_ACQUIA_APP_NAME": "", - "DREVOPS_ACQUIA_KEY": "", - "DREVOPS_ACQUIA_SECRET": "", - "DREVOPS_DB_DIR": "./.data", - "DREVOPS_DB_DOWNLOAD_ACQUIA_DB_NAME": "your_site", - "DREVOPS_DB_DOWNLOAD_CURL_URL": "https://github.com/drevops/scaffold/releases/download/1.18.0/db_d10.demo.sql", - "DREVOPS_DB_DOWNLOAD_ENVIRONMENT": "prod", - "DREVOPS_DB_DOWNLOAD_FORCE": "1", - "DREVOPS_DB_DOWNLOAD_FTP_FILE": "db.sql", - "DREVOPS_DB_DOWNLOAD_FTP_HOST": "", - "DREVOPS_DB_DOWNLOAD_FTP_PASS": "", - "DREVOPS_DB_DOWNLOAD_FTP_PORT": "21", - "DREVOPS_DB_DOWNLOAD_FTP_USER": "", - "DREVOPS_DB_DOWNLOAD_SOURCE": "curl", - "DREVOPS_DB_FILE": "db.sql", - "DREVOPS_DEPLOY_TYPES": "artifact", - "DREVOPS_LAGOON_PRODUCTION_BRANCH": "main", "DREVOPS_LOCALDEV_URL": "star_wars.docker.amazee.io", - "DREVOPS_NOTIFY_CHANNELS": "email", - "DREVOPS_NOTIFY_EMAIL_FROM": "webmaster@your-site-url.example", - "DREVOPS_NOTIFY_EMAIL_RECIPIENTS": "webmaster@your-site-url.example", - "DREVOPS_PROJECT": "your_site", - "DREVOPS_PROVISION_OVERRIDE_DB": "1", - "DREVOPS_PROVISION_SANITIZE_DB_EMAIL": "user_%uid@your-site-url.example", - "DREVOPS_PROVISION_SANITIZE_DB_SKIP": "0", - "DREVOPS_PROVISION_USE_MAINTENANCE_MODE": "1", - "DREVOPS_PROVISION_USE_PROFILE": "0", - "DREVOPS_TZ": "Australia/Melbourne", - "DREVOPS_WEBROOT": "web", - "DRUPAL_CLAMAV_ENABLED": "1", - "DRUPAL_CLAMAV_MODE": "daemon", - "DRUPAL_PROFILE": "standard", "DRUPAL_REDIS_ENABLED": "0", "DRUPAL_SHIELD_PASS": "", - "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", - "DRUPAL_THEME": "your_site_theme", - "GITHUB_TOKEN": "", "LAGOON_ENVIRONMENT_TYPE": "local", - "LAGOON_PROJECT": "your_site", "LAGOON_ROUTE": "star_wars.docker.amazee.io", "MARIADB_DATABASE": "drupal", "MARIADB_HOST": "mariadb", @@ -187,49 +111,11 @@ "entrypoint": null, "environment": { "CI": "true", - "DOCKER_PASS": "", - "DOCKER_USER": "", - "DREVOPS_ACQUIA_APP_NAME": "", - "DREVOPS_ACQUIA_KEY": "", - "DREVOPS_ACQUIA_SECRET": "", - "DREVOPS_DB_DIR": "./.data", - "DREVOPS_DB_DOWNLOAD_ACQUIA_DB_NAME": "your_site", - "DREVOPS_DB_DOWNLOAD_CURL_URL": "https://github.com/drevops/scaffold/releases/download/1.18.0/db_d10.demo.sql", - "DREVOPS_DB_DOWNLOAD_ENVIRONMENT": "prod", - "DREVOPS_DB_DOWNLOAD_FORCE": "1", - "DREVOPS_DB_DOWNLOAD_FTP_FILE": "db.sql", - "DREVOPS_DB_DOWNLOAD_FTP_HOST": "", - "DREVOPS_DB_DOWNLOAD_FTP_PASS": "", - "DREVOPS_DB_DOWNLOAD_FTP_PORT": "21", - "DREVOPS_DB_DOWNLOAD_FTP_USER": "", - "DREVOPS_DB_DOWNLOAD_SOURCE": "curl", - "DREVOPS_DB_FILE": "db.sql", - "DREVOPS_DEPLOY_TYPES": "artifact", - "DREVOPS_LAGOON_PRODUCTION_BRANCH": "main", "DREVOPS_LOCALDEV_URL": "star_wars.docker.amazee.io", - "DREVOPS_NOTIFY_CHANNELS": "email", - "DREVOPS_NOTIFY_EMAIL_FROM": "webmaster@your-site-url.example", - "DREVOPS_NOTIFY_EMAIL_RECIPIENTS": "webmaster@your-site-url.example", - "DREVOPS_PROJECT": "your_site", - "DREVOPS_PROVISION_OVERRIDE_DB": "1", - "DREVOPS_PROVISION_SANITIZE_DB_EMAIL": "user_%uid@your-site-url.example", - "DREVOPS_PROVISION_SANITIZE_DB_SKIP": "0", - "DREVOPS_PROVISION_USE_MAINTENANCE_MODE": "1", - "DREVOPS_PROVISION_USE_PROFILE": "0", - "DREVOPS_TZ": "Australia/Melbourne", - "DREVOPS_WEBROOT": "web", - "DRUPAL_CLAMAV_ENABLED": "1", - "DRUPAL_CLAMAV_MODE": "daemon", - "DRUPAL_PROFILE": "standard", "DRUPAL_REDIS_ENABLED": "0", "DRUPAL_SHIELD_PASS": "", - "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", - "DRUPAL_THEME": "your_site_theme", - "GITHUB_TOKEN": "", "LAGOON_ENVIRONMENT_TYPE": "local", - "LAGOON_PROJECT": "your_site", "LAGOON_ROUTE": "star_wars.docker.amazee.io", "MARIADB_DATABASE": "drupal", "MARIADB_HOST": "mariadb", @@ -277,49 +163,11 @@ "entrypoint": null, "environment": { "CI": "true", - "DOCKER_PASS": "", - "DOCKER_USER": "", - "DREVOPS_ACQUIA_APP_NAME": "", - "DREVOPS_ACQUIA_KEY": "", - "DREVOPS_ACQUIA_SECRET": "", - "DREVOPS_DB_DIR": "./.data", - "DREVOPS_DB_DOWNLOAD_ACQUIA_DB_NAME": "your_site", - "DREVOPS_DB_DOWNLOAD_CURL_URL": "https://github.com/drevops/scaffold/releases/download/1.18.0/db_d10.demo.sql", - "DREVOPS_DB_DOWNLOAD_ENVIRONMENT": "prod", - "DREVOPS_DB_DOWNLOAD_FORCE": "1", - "DREVOPS_DB_DOWNLOAD_FTP_FILE": "db.sql", - "DREVOPS_DB_DOWNLOAD_FTP_HOST": "", - "DREVOPS_DB_DOWNLOAD_FTP_PASS": "", - "DREVOPS_DB_DOWNLOAD_FTP_PORT": "21", - "DREVOPS_DB_DOWNLOAD_FTP_USER": "", - "DREVOPS_DB_DOWNLOAD_SOURCE": "curl", - "DREVOPS_DB_FILE": "db.sql", - "DREVOPS_DEPLOY_TYPES": "artifact", - "DREVOPS_LAGOON_PRODUCTION_BRANCH": "main", "DREVOPS_LOCALDEV_URL": "star_wars.docker.amazee.io", - "DREVOPS_NOTIFY_CHANNELS": "email", - "DREVOPS_NOTIFY_EMAIL_FROM": "webmaster@your-site-url.example", - "DREVOPS_NOTIFY_EMAIL_RECIPIENTS": "webmaster@your-site-url.example", - "DREVOPS_PROJECT": "your_site", - "DREVOPS_PROVISION_OVERRIDE_DB": "1", - "DREVOPS_PROVISION_SANITIZE_DB_EMAIL": "user_%uid@your-site-url.example", - "DREVOPS_PROVISION_SANITIZE_DB_SKIP": "0", - "DREVOPS_PROVISION_USE_MAINTENANCE_MODE": "1", - "DREVOPS_PROVISION_USE_PROFILE": "0", - "DREVOPS_TZ": "Australia/Melbourne", - "DREVOPS_WEBROOT": "web", - "DRUPAL_CLAMAV_ENABLED": "1", - "DRUPAL_CLAMAV_MODE": "daemon", - "DRUPAL_PROFILE": "standard", "DRUPAL_REDIS_ENABLED": "0", "DRUPAL_SHIELD_PASS": "", - "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", - "DRUPAL_THEME": "your_site_theme", - "GITHUB_TOKEN": "", "LAGOON_ENVIRONMENT_TYPE": "local", - "LAGOON_PROJECT": "your_site", "LAGOON_ROUTE": "star_wars.docker.amazee.io", "MARIADB_DATABASE": "drupal", "MARIADB_HOST": "mariadb", @@ -364,49 +212,11 @@ "entrypoint": null, "environment": { "CI": "true", - "DOCKER_PASS": "", - "DOCKER_USER": "", - "DREVOPS_ACQUIA_APP_NAME": "", - "DREVOPS_ACQUIA_KEY": "", - "DREVOPS_ACQUIA_SECRET": "", - "DREVOPS_DB_DIR": "./.data", - "DREVOPS_DB_DOWNLOAD_ACQUIA_DB_NAME": "your_site", - "DREVOPS_DB_DOWNLOAD_CURL_URL": "https://github.com/drevops/scaffold/releases/download/1.18.0/db_d10.demo.sql", - "DREVOPS_DB_DOWNLOAD_ENVIRONMENT": "prod", - "DREVOPS_DB_DOWNLOAD_FORCE": "1", - "DREVOPS_DB_DOWNLOAD_FTP_FILE": "db.sql", - "DREVOPS_DB_DOWNLOAD_FTP_HOST": "", - "DREVOPS_DB_DOWNLOAD_FTP_PASS": "", - "DREVOPS_DB_DOWNLOAD_FTP_PORT": "21", - "DREVOPS_DB_DOWNLOAD_FTP_USER": "", - "DREVOPS_DB_DOWNLOAD_SOURCE": "curl", - "DREVOPS_DB_FILE": "db.sql", - "DREVOPS_DEPLOY_TYPES": "artifact", - "DREVOPS_LAGOON_PRODUCTION_BRANCH": "main", "DREVOPS_LOCALDEV_URL": "star_wars.docker.amazee.io", - "DREVOPS_NOTIFY_CHANNELS": "email", - "DREVOPS_NOTIFY_EMAIL_FROM": "webmaster@your-site-url.example", - "DREVOPS_NOTIFY_EMAIL_RECIPIENTS": "webmaster@your-site-url.example", - "DREVOPS_PROJECT": "your_site", - "DREVOPS_PROVISION_OVERRIDE_DB": "1", - "DREVOPS_PROVISION_SANITIZE_DB_EMAIL": "user_%uid@your-site-url.example", - "DREVOPS_PROVISION_SANITIZE_DB_SKIP": "0", - "DREVOPS_PROVISION_USE_MAINTENANCE_MODE": "1", - "DREVOPS_PROVISION_USE_PROFILE": "0", - "DREVOPS_TZ": "Australia/Melbourne", - "DREVOPS_WEBROOT": "web", - "DRUPAL_CLAMAV_ENABLED": "1", - "DRUPAL_CLAMAV_MODE": "daemon", - "DRUPAL_PROFILE": "standard", "DRUPAL_REDIS_ENABLED": "0", "DRUPAL_SHIELD_PASS": "", - "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", - "DRUPAL_THEME": "your_site_theme", - "GITHUB_TOKEN": "", "LAGOON_ENVIRONMENT_TYPE": "local", - "LAGOON_PROJECT": "your_site", "LAGOON_ROUTE": "star_wars.docker.amazee.io", "MARIADB_DATABASE": "drupal", "MARIADB_HOST": "mariadb", @@ -461,49 +271,11 @@ "entrypoint": null, "environment": { "CI": "true", - "DOCKER_PASS": "", - "DOCKER_USER": "", - "DREVOPS_ACQUIA_APP_NAME": "", - "DREVOPS_ACQUIA_KEY": "", - "DREVOPS_ACQUIA_SECRET": "", - "DREVOPS_DB_DIR": "./.data", - "DREVOPS_DB_DOWNLOAD_ACQUIA_DB_NAME": "your_site", - "DREVOPS_DB_DOWNLOAD_CURL_URL": "https://github.com/drevops/scaffold/releases/download/1.18.0/db_d10.demo.sql", - "DREVOPS_DB_DOWNLOAD_ENVIRONMENT": "prod", - "DREVOPS_DB_DOWNLOAD_FORCE": "1", - "DREVOPS_DB_DOWNLOAD_FTP_FILE": "db.sql", - "DREVOPS_DB_DOWNLOAD_FTP_HOST": "", - "DREVOPS_DB_DOWNLOAD_FTP_PASS": "", - "DREVOPS_DB_DOWNLOAD_FTP_PORT": "21", - "DREVOPS_DB_DOWNLOAD_FTP_USER": "", - "DREVOPS_DB_DOWNLOAD_SOURCE": "curl", - "DREVOPS_DB_FILE": "db.sql", - "DREVOPS_DEPLOY_TYPES": "artifact", - "DREVOPS_LAGOON_PRODUCTION_BRANCH": "main", "DREVOPS_LOCALDEV_URL": "star_wars.docker.amazee.io", - "DREVOPS_NOTIFY_CHANNELS": "email", - "DREVOPS_NOTIFY_EMAIL_FROM": "webmaster@your-site-url.example", - "DREVOPS_NOTIFY_EMAIL_RECIPIENTS": "webmaster@your-site-url.example", - "DREVOPS_PROJECT": "your_site", - "DREVOPS_PROVISION_OVERRIDE_DB": "1", - "DREVOPS_PROVISION_SANITIZE_DB_EMAIL": "user_%uid@your-site-url.example", - "DREVOPS_PROVISION_SANITIZE_DB_SKIP": "0", - "DREVOPS_PROVISION_USE_MAINTENANCE_MODE": "1", - "DREVOPS_PROVISION_USE_PROFILE": "0", - "DREVOPS_TZ": "Australia/Melbourne", - "DREVOPS_WEBROOT": "web", - "DRUPAL_CLAMAV_ENABLED": "1", - "DRUPAL_CLAMAV_MODE": "daemon", - "DRUPAL_PROFILE": "standard", "DRUPAL_REDIS_ENABLED": "0", "DRUPAL_SHIELD_PASS": "", - "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", - "DRUPAL_THEME": "your_site_theme", - "GITHUB_TOKEN": "", "LAGOON_ENVIRONMENT_TYPE": "local", - "LAGOON_PROJECT": "your_site", "LAGOON_ROUTE": "star_wars.docker.amazee.io", "MARIADB_DATABASE": "drupal", "MARIADB_HOST": "mariadb", @@ -568,49 +340,11 @@ "entrypoint": null, "environment": { "CI": "true", - "DOCKER_PASS": "", - "DOCKER_USER": "", - "DREVOPS_ACQUIA_APP_NAME": "", - "DREVOPS_ACQUIA_KEY": "", - "DREVOPS_ACQUIA_SECRET": "", - "DREVOPS_DB_DIR": "./.data", - "DREVOPS_DB_DOWNLOAD_ACQUIA_DB_NAME": "your_site", - "DREVOPS_DB_DOWNLOAD_CURL_URL": "https://github.com/drevops/scaffold/releases/download/1.18.0/db_d10.demo.sql", - "DREVOPS_DB_DOWNLOAD_ENVIRONMENT": "prod", - "DREVOPS_DB_DOWNLOAD_FORCE": "1", - "DREVOPS_DB_DOWNLOAD_FTP_FILE": "db.sql", - "DREVOPS_DB_DOWNLOAD_FTP_HOST": "", - "DREVOPS_DB_DOWNLOAD_FTP_PASS": "", - "DREVOPS_DB_DOWNLOAD_FTP_PORT": "21", - "DREVOPS_DB_DOWNLOAD_FTP_USER": "", - "DREVOPS_DB_DOWNLOAD_SOURCE": "curl", - "DREVOPS_DB_FILE": "db.sql", - "DREVOPS_DEPLOY_TYPES": "artifact", - "DREVOPS_LAGOON_PRODUCTION_BRANCH": "main", "DREVOPS_LOCALDEV_URL": "star_wars.docker.amazee.io", - "DREVOPS_NOTIFY_CHANNELS": "email", - "DREVOPS_NOTIFY_EMAIL_FROM": "webmaster@your-site-url.example", - "DREVOPS_NOTIFY_EMAIL_RECIPIENTS": "webmaster@your-site-url.example", - "DREVOPS_PROJECT": "your_site", - "DREVOPS_PROVISION_OVERRIDE_DB": "1", - "DREVOPS_PROVISION_SANITIZE_DB_EMAIL": "user_%uid@your-site-url.example", - "DREVOPS_PROVISION_SANITIZE_DB_SKIP": "0", - "DREVOPS_PROVISION_USE_MAINTENANCE_MODE": "1", - "DREVOPS_PROVISION_USE_PROFILE": "0", - "DREVOPS_TZ": "Australia/Melbourne", - "DREVOPS_WEBROOT": "web", - "DRUPAL_CLAMAV_ENABLED": "1", - "DRUPAL_CLAMAV_MODE": "daemon", - "DRUPAL_PROFILE": "standard", "DRUPAL_REDIS_ENABLED": "0", "DRUPAL_SHIELD_PASS": "", - "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", - "DRUPAL_THEME": "your_site_theme", - "GITHUB_TOKEN": "", "LAGOON_ENVIRONMENT_TYPE": "local", - "LAGOON_PROJECT": "your_site", "LAGOON_ROUTE": "star_wars.docker.amazee.io", "MARIADB_DATABASE": "drupal", "MARIADB_HOST": "mariadb", diff --git a/.scaffold/tests/bats/fixtures/docker-compose.env_mod.json b/.scaffold/tests/bats/fixtures/docker-compose.env_mod.json index 9275f7282..cb393ea30 100644 --- a/.scaffold/tests/bats/fixtures/docker-compose.env_mod.json +++ b/.scaffold/tests/bats/fixtures/docker-compose.env_mod.json @@ -23,43 +23,11 @@ "entrypoint": null, "environment": { "CI": "true", - "COMPOSE_PROJECT_NAME": "the_matrix", - "DREVOPS_ACQUIA_APP_NAME": "", - "DREVOPS_DB_DIR": "./.data", - "DREVOPS_DB_DOCKER_IMAGE": "myorg/my_db_image", - "DREVOPS_DB_DOWNLOAD_ACQUIA_DB_NAME": "your_site", - "DREVOPS_DB_DOWNLOAD_CURL_URL": "https://github.com/drevops/scaffold/releases/download/1.18.0/db_d10.demo.sql", - "DREVOPS_DB_DOWNLOAD_ENVIRONMENT": "prod", - "DREVOPS_DB_DOWNLOAD_FTP_FILE": "db.sql", - "DREVOPS_DB_DOWNLOAD_FTP_HOST": "", - "DREVOPS_DB_DOWNLOAD_FTP_PORT": "21", - "DREVOPS_DB_DOWNLOAD_SOURCE": "curl", - "DREVOPS_DB_FILE": "db.sql", - "DREVOPS_DEPLOY_TYPES": "artifact", - "DREVOPS_LAGOON_PRODUCTION_BRANCH": "main", "DREVOPS_LOCALDEV_URL": "the_matrix.docker.amazee.io", - "DREVOPS_NOTIFY_CHANNELS": "email", - "DREVOPS_NOTIFY_EMAIL_FROM": "webmaster@your-site-url.example", - "DREVOPS_NOTIFY_EMAIL_RECIPIENTS": "webmaster@your-site-url.example", - "DREVOPS_PROJECT": "your_site", - "DREVOPS_PROVISION_OVERRIDE_DB": "0", - "DREVOPS_PROVISION_SANITIZE_DB_EMAIL": "user_%uid@your-site-url.example", - "DREVOPS_PROVISION_SANITIZE_DB_SKIP": "0", - "DREVOPS_PROVISION_USE_MAINTENANCE_MODE": "1", - "DREVOPS_PROVISION_USE_PROFILE": "0", - "DREVOPS_TZ": "Australia/Melbourne", - "DREVOPS_WEBROOT": "docroot", - "DRUPAL_CLAMAV_ENABLED": "1", - "DRUPAL_CLAMAV_MODE": "daemon", - "DRUPAL_PROFILE": "standard", "DRUPAL_REDIS_ENABLED": "1", "DRUPAL_SHIELD_PASS": "passw", - "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "jane", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", - "DRUPAL_THEME": "your_site_theme", "LAGOON_ENVIRONMENT_TYPE": "development", - "LAGOON_PROJECT": "your_site", "LAGOON_ROUTE": "the_matrix.docker.amazee.io", "MARIADB_DATABASE": "drupal", "MARIADB_HOST": "mariadb", @@ -98,43 +66,11 @@ "entrypoint": null, "environment": { "CI": "true", - "COMPOSE_PROJECT_NAME": "the_matrix", - "DREVOPS_ACQUIA_APP_NAME": "", - "DREVOPS_DB_DIR": "./.data", - "DREVOPS_DB_DOCKER_IMAGE": "myorg/my_db_image", - "DREVOPS_DB_DOWNLOAD_ACQUIA_DB_NAME": "your_site", - "DREVOPS_DB_DOWNLOAD_CURL_URL": "https://github.com/drevops/scaffold/releases/download/1.18.0/db_d10.demo.sql", - "DREVOPS_DB_DOWNLOAD_ENVIRONMENT": "prod", - "DREVOPS_DB_DOWNLOAD_FTP_FILE": "db.sql", - "DREVOPS_DB_DOWNLOAD_FTP_HOST": "", - "DREVOPS_DB_DOWNLOAD_FTP_PORT": "21", - "DREVOPS_DB_DOWNLOAD_SOURCE": "curl", - "DREVOPS_DB_FILE": "db.sql", - "DREVOPS_DEPLOY_TYPES": "artifact", - "DREVOPS_LAGOON_PRODUCTION_BRANCH": "main", "DREVOPS_LOCALDEV_URL": "the_matrix.docker.amazee.io", - "DREVOPS_NOTIFY_CHANNELS": "email", - "DREVOPS_NOTIFY_EMAIL_FROM": "webmaster@your-site-url.example", - "DREVOPS_NOTIFY_EMAIL_RECIPIENTS": "webmaster@your-site-url.example", - "DREVOPS_PROJECT": "your_site", - "DREVOPS_PROVISION_OVERRIDE_DB": "0", - "DREVOPS_PROVISION_SANITIZE_DB_EMAIL": "user_%uid@your-site-url.example", - "DREVOPS_PROVISION_SANITIZE_DB_SKIP": "0", - "DREVOPS_PROVISION_USE_MAINTENANCE_MODE": "1", - "DREVOPS_PROVISION_USE_PROFILE": "0", - "DREVOPS_TZ": "Australia/Melbourne", - "DREVOPS_WEBROOT": "docroot", - "DRUPAL_CLAMAV_ENABLED": "1", - "DRUPAL_CLAMAV_MODE": "daemon", - "DRUPAL_PROFILE": "standard", "DRUPAL_REDIS_ENABLED": "1", "DRUPAL_SHIELD_PASS": "passw", - "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "jane", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", - "DRUPAL_THEME": "your_site_theme", "LAGOON_ENVIRONMENT_TYPE": "development", - "LAGOON_PROJECT": "your_site", "LAGOON_ROUTE": "the_matrix.docker.amazee.io", "MARIADB_DATABASE": "drupal", "MARIADB_HOST": "mariadb", @@ -175,43 +111,11 @@ "entrypoint": null, "environment": { "CI": "true", - "COMPOSE_PROJECT_NAME": "the_matrix", - "DREVOPS_ACQUIA_APP_NAME": "", - "DREVOPS_DB_DIR": "./.data", - "DREVOPS_DB_DOCKER_IMAGE": "myorg/my_db_image", - "DREVOPS_DB_DOWNLOAD_ACQUIA_DB_NAME": "your_site", - "DREVOPS_DB_DOWNLOAD_CURL_URL": "https://github.com/drevops/scaffold/releases/download/1.18.0/db_d10.demo.sql", - "DREVOPS_DB_DOWNLOAD_ENVIRONMENT": "prod", - "DREVOPS_DB_DOWNLOAD_FTP_FILE": "db.sql", - "DREVOPS_DB_DOWNLOAD_FTP_HOST": "", - "DREVOPS_DB_DOWNLOAD_FTP_PORT": "21", - "DREVOPS_DB_DOWNLOAD_SOURCE": "curl", - "DREVOPS_DB_FILE": "db.sql", - "DREVOPS_DEPLOY_TYPES": "artifact", - "DREVOPS_LAGOON_PRODUCTION_BRANCH": "main", "DREVOPS_LOCALDEV_URL": "the_matrix.docker.amazee.io", - "DREVOPS_NOTIFY_CHANNELS": "email", - "DREVOPS_NOTIFY_EMAIL_FROM": "webmaster@your-site-url.example", - "DREVOPS_NOTIFY_EMAIL_RECIPIENTS": "webmaster@your-site-url.example", - "DREVOPS_PROJECT": "your_site", - "DREVOPS_PROVISION_OVERRIDE_DB": "0", - "DREVOPS_PROVISION_SANITIZE_DB_EMAIL": "user_%uid@your-site-url.example", - "DREVOPS_PROVISION_SANITIZE_DB_SKIP": "0", - "DREVOPS_PROVISION_USE_MAINTENANCE_MODE": "1", - "DREVOPS_PROVISION_USE_PROFILE": "0", - "DREVOPS_TZ": "Australia/Melbourne", - "DREVOPS_WEBROOT": "docroot", - "DRUPAL_CLAMAV_ENABLED": "1", - "DRUPAL_CLAMAV_MODE": "daemon", - "DRUPAL_PROFILE": "standard", "DRUPAL_REDIS_ENABLED": "1", "DRUPAL_SHIELD_PASS": "passw", - "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "jane", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", - "DRUPAL_THEME": "your_site_theme", "LAGOON_ENVIRONMENT_TYPE": "development", - "LAGOON_PROJECT": "your_site", "LAGOON_ROUTE": "the_matrix.docker.amazee.io", "MARIADB_DATABASE": "drupal", "MARIADB_HOST": "mariadb", @@ -259,43 +163,11 @@ "entrypoint": null, "environment": { "CI": "true", - "COMPOSE_PROJECT_NAME": "the_matrix", - "DREVOPS_ACQUIA_APP_NAME": "", - "DREVOPS_DB_DIR": "./.data", - "DREVOPS_DB_DOCKER_IMAGE": "myorg/my_db_image", - "DREVOPS_DB_DOWNLOAD_ACQUIA_DB_NAME": "your_site", - "DREVOPS_DB_DOWNLOAD_CURL_URL": "https://github.com/drevops/scaffold/releases/download/1.18.0/db_d10.demo.sql", - "DREVOPS_DB_DOWNLOAD_ENVIRONMENT": "prod", - "DREVOPS_DB_DOWNLOAD_FTP_FILE": "db.sql", - "DREVOPS_DB_DOWNLOAD_FTP_HOST": "", - "DREVOPS_DB_DOWNLOAD_FTP_PORT": "21", - "DREVOPS_DB_DOWNLOAD_SOURCE": "curl", - "DREVOPS_DB_FILE": "db.sql", - "DREVOPS_DEPLOY_TYPES": "artifact", - "DREVOPS_LAGOON_PRODUCTION_BRANCH": "main", "DREVOPS_LOCALDEV_URL": "the_matrix.docker.amazee.io", - "DREVOPS_NOTIFY_CHANNELS": "email", - "DREVOPS_NOTIFY_EMAIL_FROM": "webmaster@your-site-url.example", - "DREVOPS_NOTIFY_EMAIL_RECIPIENTS": "webmaster@your-site-url.example", - "DREVOPS_PROJECT": "your_site", - "DREVOPS_PROVISION_OVERRIDE_DB": "0", - "DREVOPS_PROVISION_SANITIZE_DB_EMAIL": "user_%uid@your-site-url.example", - "DREVOPS_PROVISION_SANITIZE_DB_SKIP": "0", - "DREVOPS_PROVISION_USE_MAINTENANCE_MODE": "1", - "DREVOPS_PROVISION_USE_PROFILE": "0", - "DREVOPS_TZ": "Australia/Melbourne", - "DREVOPS_WEBROOT": "docroot", - "DRUPAL_CLAMAV_ENABLED": "1", - "DRUPAL_CLAMAV_MODE": "daemon", - "DRUPAL_PROFILE": "standard", "DRUPAL_REDIS_ENABLED": "1", "DRUPAL_SHIELD_PASS": "passw", - "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "jane", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", - "DRUPAL_THEME": "your_site_theme", "LAGOON_ENVIRONMENT_TYPE": "development", - "LAGOON_PROJECT": "your_site", "LAGOON_ROUTE": "the_matrix.docker.amazee.io", "MARIADB_DATABASE": "drupal", "MARIADB_HOST": "mariadb", @@ -340,43 +212,11 @@ "entrypoint": null, "environment": { "CI": "true", - "COMPOSE_PROJECT_NAME": "the_matrix", - "DREVOPS_ACQUIA_APP_NAME": "", - "DREVOPS_DB_DIR": "./.data", - "DREVOPS_DB_DOCKER_IMAGE": "myorg/my_db_image", - "DREVOPS_DB_DOWNLOAD_ACQUIA_DB_NAME": "your_site", - "DREVOPS_DB_DOWNLOAD_CURL_URL": "https://github.com/drevops/scaffold/releases/download/1.18.0/db_d10.demo.sql", - "DREVOPS_DB_DOWNLOAD_ENVIRONMENT": "prod", - "DREVOPS_DB_DOWNLOAD_FTP_FILE": "db.sql", - "DREVOPS_DB_DOWNLOAD_FTP_HOST": "", - "DREVOPS_DB_DOWNLOAD_FTP_PORT": "21", - "DREVOPS_DB_DOWNLOAD_SOURCE": "curl", - "DREVOPS_DB_FILE": "db.sql", - "DREVOPS_DEPLOY_TYPES": "artifact", - "DREVOPS_LAGOON_PRODUCTION_BRANCH": "main", "DREVOPS_LOCALDEV_URL": "the_matrix.docker.amazee.io", - "DREVOPS_NOTIFY_CHANNELS": "email", - "DREVOPS_NOTIFY_EMAIL_FROM": "webmaster@your-site-url.example", - "DREVOPS_NOTIFY_EMAIL_RECIPIENTS": "webmaster@your-site-url.example", - "DREVOPS_PROJECT": "your_site", - "DREVOPS_PROVISION_OVERRIDE_DB": "0", - "DREVOPS_PROVISION_SANITIZE_DB_EMAIL": "user_%uid@your-site-url.example", - "DREVOPS_PROVISION_SANITIZE_DB_SKIP": "0", - "DREVOPS_PROVISION_USE_MAINTENANCE_MODE": "1", - "DREVOPS_PROVISION_USE_PROFILE": "0", - "DREVOPS_TZ": "Australia/Melbourne", - "DREVOPS_WEBROOT": "docroot", - "DRUPAL_CLAMAV_ENABLED": "1", - "DRUPAL_CLAMAV_MODE": "daemon", - "DRUPAL_PROFILE": "standard", "DRUPAL_REDIS_ENABLED": "1", "DRUPAL_SHIELD_PASS": "passw", - "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "jane", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", - "DRUPAL_THEME": "your_site_theme", "LAGOON_ENVIRONMENT_TYPE": "development", - "LAGOON_PROJECT": "your_site", "LAGOON_ROUTE": "the_matrix.docker.amazee.io", "MARIADB_DATABASE": "drupal", "MARIADB_HOST": "mariadb", @@ -431,43 +271,11 @@ "entrypoint": null, "environment": { "CI": "true", - "COMPOSE_PROJECT_NAME": "the_matrix", - "DREVOPS_ACQUIA_APP_NAME": "", - "DREVOPS_DB_DIR": "./.data", - "DREVOPS_DB_DOCKER_IMAGE": "myorg/my_db_image", - "DREVOPS_DB_DOWNLOAD_ACQUIA_DB_NAME": "your_site", - "DREVOPS_DB_DOWNLOAD_CURL_URL": "https://github.com/drevops/scaffold/releases/download/1.18.0/db_d10.demo.sql", - "DREVOPS_DB_DOWNLOAD_ENVIRONMENT": "prod", - "DREVOPS_DB_DOWNLOAD_FTP_FILE": "db.sql", - "DREVOPS_DB_DOWNLOAD_FTP_HOST": "", - "DREVOPS_DB_DOWNLOAD_FTP_PORT": "21", - "DREVOPS_DB_DOWNLOAD_SOURCE": "curl", - "DREVOPS_DB_FILE": "db.sql", - "DREVOPS_DEPLOY_TYPES": "artifact", - "DREVOPS_LAGOON_PRODUCTION_BRANCH": "main", "DREVOPS_LOCALDEV_URL": "the_matrix.docker.amazee.io", - "DREVOPS_NOTIFY_CHANNELS": "email", - "DREVOPS_NOTIFY_EMAIL_FROM": "webmaster@your-site-url.example", - "DREVOPS_NOTIFY_EMAIL_RECIPIENTS": "webmaster@your-site-url.example", - "DREVOPS_PROJECT": "your_site", - "DREVOPS_PROVISION_OVERRIDE_DB": "0", - "DREVOPS_PROVISION_SANITIZE_DB_EMAIL": "user_%uid@your-site-url.example", - "DREVOPS_PROVISION_SANITIZE_DB_SKIP": "0", - "DREVOPS_PROVISION_USE_MAINTENANCE_MODE": "1", - "DREVOPS_PROVISION_USE_PROFILE": "0", - "DREVOPS_TZ": "Australia/Melbourne", - "DREVOPS_WEBROOT": "docroot", - "DRUPAL_CLAMAV_ENABLED": "1", - "DRUPAL_CLAMAV_MODE": "daemon", - "DRUPAL_PROFILE": "standard", "DRUPAL_REDIS_ENABLED": "1", "DRUPAL_SHIELD_PASS": "passw", - "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "jane", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", - "DRUPAL_THEME": "your_site_theme", "LAGOON_ENVIRONMENT_TYPE": "development", - "LAGOON_PROJECT": "your_site", "LAGOON_ROUTE": "the_matrix.docker.amazee.io", "MARIADB_DATABASE": "drupal", "MARIADB_HOST": "mariadb", @@ -532,43 +340,11 @@ "entrypoint": null, "environment": { "CI": "true", - "COMPOSE_PROJECT_NAME": "the_matrix", - "DREVOPS_ACQUIA_APP_NAME": "", - "DREVOPS_DB_DIR": "./.data", - "DREVOPS_DB_DOCKER_IMAGE": "myorg/my_db_image", - "DREVOPS_DB_DOWNLOAD_ACQUIA_DB_NAME": "your_site", - "DREVOPS_DB_DOWNLOAD_CURL_URL": "https://github.com/drevops/scaffold/releases/download/1.18.0/db_d10.demo.sql", - "DREVOPS_DB_DOWNLOAD_ENVIRONMENT": "prod", - "DREVOPS_DB_DOWNLOAD_FTP_FILE": "db.sql", - "DREVOPS_DB_DOWNLOAD_FTP_HOST": "", - "DREVOPS_DB_DOWNLOAD_FTP_PORT": "21", - "DREVOPS_DB_DOWNLOAD_SOURCE": "curl", - "DREVOPS_DB_FILE": "db.sql", - "DREVOPS_DEPLOY_TYPES": "artifact", - "DREVOPS_LAGOON_PRODUCTION_BRANCH": "main", "DREVOPS_LOCALDEV_URL": "the_matrix.docker.amazee.io", - "DREVOPS_NOTIFY_CHANNELS": "email", - "DREVOPS_NOTIFY_EMAIL_FROM": "webmaster@your-site-url.example", - "DREVOPS_NOTIFY_EMAIL_RECIPIENTS": "webmaster@your-site-url.example", - "DREVOPS_PROJECT": "your_site", - "DREVOPS_PROVISION_OVERRIDE_DB": "0", - "DREVOPS_PROVISION_SANITIZE_DB_EMAIL": "user_%uid@your-site-url.example", - "DREVOPS_PROVISION_SANITIZE_DB_SKIP": "0", - "DREVOPS_PROVISION_USE_MAINTENANCE_MODE": "1", - "DREVOPS_PROVISION_USE_PROFILE": "0", - "DREVOPS_TZ": "Australia/Melbourne", - "DREVOPS_WEBROOT": "docroot", - "DRUPAL_CLAMAV_ENABLED": "1", - "DRUPAL_CLAMAV_MODE": "daemon", - "DRUPAL_PROFILE": "standard", "DRUPAL_REDIS_ENABLED": "1", "DRUPAL_SHIELD_PASS": "passw", - "DRUPAL_SHIELD_PRINT": "Restricted access.", "DRUPAL_SHIELD_USER": "jane", - "DRUPAL_STAGE_FILE_PROXY_ORIGIN": "https://www.your-site-url.example/", - "DRUPAL_THEME": "your_site_theme", "LAGOON_ENVIRONMENT_TYPE": "development", - "LAGOON_PROJECT": "your_site", "LAGOON_ROUTE": "the_matrix.docker.amazee.io", "MARIADB_DATABASE": "drupal", "MARIADB_HOST": "mariadb", diff --git a/docker-compose.yml b/docker-compose.yml index 47539f798..2ceae2fd8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -36,13 +36,6 @@ x-user: &default-user # Change this if you are on linux and run with another user than id `1000` user: '1000' -x-environment-files: &default-environment-files - env_file: - - path: .env - required: false - - path: .env.local - required: false - # Environment variables set in all containers during build and runtime. #;< LAGOON # Note that these variables are not read from here in Lagoon environment. @@ -96,7 +89,7 @@ services: GITHUB_TOKEN: "${GITHUB_TOKEN:-}" image: &cli-image ${COMPOSE_PROJECT_NAME:-example_site} user: root - <<: [*default-volumes, *default-environment-files] + <<: *default-volumes environment: <<: *default-environment # Mount volumes from the ssh-agent running in Pygmy to inject host SSH key into container. See https://pygmy.readthedocs.io/en/master/ssh_agent/ @@ -116,7 +109,7 @@ services: args: CLI_IMAGE: *cli-image WEBROOT: "${DREVOPS_WEBROOT:-web}" - <<: [*default-volumes, *default-user, *default-environment-files] + <<: [*default-volumes, *default-user] environment: <<: *default-environment depends_on: @@ -139,7 +132,7 @@ services: dockerfile: .docker/php.dockerfile args: CLI_IMAGE: *cli-image - <<: [*default-volumes, *default-user, *default-environment-files] + <<: [*default-volumes, *default-user] environment: <<: *default-environment depends_on: @@ -158,7 +151,7 @@ services: dockerfile: .docker/mariadb.dockerfile args: IMAGE: "${DREVOPS_DB_DOCKER_IMAGE:-uselagoon/mariadb-drupal:24.3.1}" # Use custom database image (if defined) or fallback to standard database image. - <<: [*default-user, *default-environment-files] + <<: *default-user environment: <<: *default-environment ports: @@ -184,7 +177,6 @@ services: dockerfile: .docker/solr.dockerfile args: CLI_IMAGE: *cli-image - <<: *default-environment-files environment: <<: *default-environment depends_on: @@ -204,7 +196,6 @@ services: image: clamav/clamav:1.3.1 ports: - "3310" # Find port on host with `docker-compose port clamav 3310`. - <<: *default-environment-files environment: << : *default-environment networks: @@ -221,7 +212,7 @@ services: chrome: image: selenium/standalone-chrome:111.0 shm_size: '1gb' # Increase '/dev/shm' partition size to avoid browser crashing. - <<: [*default-volumes, *default-environment-files] # Use default volumes to provide access to test fixtures. + <<: *default-volumes # Use default volumes to provide access to test fixtures. environment: <<: *default-environment depends_on: