Skip to content

Commit

Permalink
[#1353] Removed $LAGOON_ENVIRONMENT_TYPE from docker-compose.yml.
Browse files Browse the repository at this point in the history
  • Loading branch information
@AlexSkrypnyk
AlexSkrypnyk committed Aug 16, 2024
1 parent fbf9a80 commit c7f74a7
Show file tree
Hide file tree
Showing 8 changed files with 86 additions and 67 deletions.
7 changes: 0 additions & 7 deletions .scaffold/tests/bats/fixtures/docker-compose.env.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
"DRUPAL_SHIELD_PASS": "",
"DRUPAL_SHIELD_USER": "",
"DRUPAL_TEMPORARY_FILES": "/tmp",
"LAGOON_ENVIRONMENT_TYPE": "local",
"LAGOON_ROUTE": "star_wars.docker.amazee.io",
"MARIADB_DATABASE": "drupal",
"MARIADB_HOST": "mariadb",
Expand Down Expand Up @@ -78,7 +77,6 @@
"DRUPAL_SHIELD_PASS": "",
"DRUPAL_SHIELD_USER": "",
"DRUPAL_TEMPORARY_FILES": "/tmp",
"LAGOON_ENVIRONMENT_TYPE": "local",
"LAGOON_ROUTE": "star_wars.docker.amazee.io",
"MARIADB_DATABASE": "drupal",
"MARIADB_HOST": "mariadb",
Expand Down Expand Up @@ -127,7 +125,6 @@
"DRUPAL_SHIELD_PASS": "",
"DRUPAL_SHIELD_USER": "",
"DRUPAL_TEMPORARY_FILES": "/tmp",
"LAGOON_ENVIRONMENT_TYPE": "local",
"LAGOON_ROUTE": "star_wars.docker.amazee.io",
"MARIADB_DATABASE": "drupal",
"MARIADB_HOST": "mariadb",
Expand Down Expand Up @@ -183,7 +180,6 @@
"DRUPAL_SHIELD_PASS": "",
"DRUPAL_SHIELD_USER": "",
"DRUPAL_TEMPORARY_FILES": "/tmp",
"LAGOON_ENVIRONMENT_TYPE": "local",
"LAGOON_ROUTE": "star_wars.docker.amazee.io",
"MARIADB_DATABASE": "drupal",
"MARIADB_HOST": "mariadb",
Expand Down Expand Up @@ -240,7 +236,6 @@
"DRUPAL_SHIELD_PASS": "",
"DRUPAL_SHIELD_USER": "",
"DRUPAL_TEMPORARY_FILES": "/tmp",
"LAGOON_ENVIRONMENT_TYPE": "local",
"LAGOON_ROUTE": "star_wars.docker.amazee.io",
"MARIADB_DATABASE": "drupal",
"MARIADB_HOST": "mariadb",
Expand Down Expand Up @@ -303,7 +298,6 @@
"DRUPAL_SHIELD_PASS": "",
"DRUPAL_SHIELD_USER": "",
"DRUPAL_TEMPORARY_FILES": "/tmp",
"LAGOON_ENVIRONMENT_TYPE": "local",
"LAGOON_ROUTE": "star_wars.docker.amazee.io",
"MARIADB_DATABASE": "drupal",
"MARIADB_HOST": "mariadb",
Expand Down Expand Up @@ -376,7 +370,6 @@
"DRUPAL_SHIELD_PASS": "",
"DRUPAL_SHIELD_USER": "",
"DRUPAL_TEMPORARY_FILES": "/tmp",
"LAGOON_ENVIRONMENT_TYPE": "local",
"LAGOON_ROUTE": "star_wars.docker.amazee.io",
"MARIADB_DATABASE": "drupal",
"MARIADB_HOST": "mariadb",
Expand Down
7 changes: 0 additions & 7 deletions .scaffold/tests/bats/fixtures/docker-compose.env_local.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
"DRUPAL_SHIELD_PASS": "",
"DRUPAL_SHIELD_USER": "",
"DRUPAL_TEMPORARY_FILES": "/tmp",
"LAGOON_ENVIRONMENT_TYPE": "local",
"LAGOON_ROUTE": "star_wars.docker.amazee.io",
"MARIADB_DATABASE": "drupal",
"MARIADB_HOST": "mariadb",
Expand Down Expand Up @@ -78,7 +77,6 @@
"DRUPAL_SHIELD_PASS": "",
"DRUPAL_SHIELD_USER": "",
"DRUPAL_TEMPORARY_FILES": "/tmp",
"LAGOON_ENVIRONMENT_TYPE": "local",
"LAGOON_ROUTE": "star_wars.docker.amazee.io",
"MARIADB_DATABASE": "drupal",
"MARIADB_HOST": "mariadb",
Expand Down Expand Up @@ -127,7 +125,6 @@
"DRUPAL_SHIELD_PASS": "",
"DRUPAL_SHIELD_USER": "",
"DRUPAL_TEMPORARY_FILES": "/tmp",
"LAGOON_ENVIRONMENT_TYPE": "local",
"LAGOON_ROUTE": "star_wars.docker.amazee.io",
"MARIADB_DATABASE": "drupal",
"MARIADB_HOST": "mariadb",
Expand Down Expand Up @@ -183,7 +180,6 @@
"DRUPAL_SHIELD_PASS": "",
"DRUPAL_SHIELD_USER": "",
"DRUPAL_TEMPORARY_FILES": "/tmp",
"LAGOON_ENVIRONMENT_TYPE": "local",
"LAGOON_ROUTE": "star_wars.docker.amazee.io",
"MARIADB_DATABASE": "drupal",
"MARIADB_HOST": "mariadb",
Expand Down Expand Up @@ -240,7 +236,6 @@
"DRUPAL_SHIELD_PASS": "",
"DRUPAL_SHIELD_USER": "",
"DRUPAL_TEMPORARY_FILES": "/tmp",
"LAGOON_ENVIRONMENT_TYPE": "local",
"LAGOON_ROUTE": "star_wars.docker.amazee.io",
"MARIADB_DATABASE": "drupal",
"MARIADB_HOST": "mariadb",
Expand Down Expand Up @@ -303,7 +298,6 @@
"DRUPAL_SHIELD_PASS": "",
"DRUPAL_SHIELD_USER": "",
"DRUPAL_TEMPORARY_FILES": "/tmp",
"LAGOON_ENVIRONMENT_TYPE": "local",
"LAGOON_ROUTE": "star_wars.docker.amazee.io",
"MARIADB_DATABASE": "drupal",
"MARIADB_HOST": "mariadb",
Expand Down Expand Up @@ -376,7 +370,6 @@
"DRUPAL_SHIELD_PASS": "",
"DRUPAL_SHIELD_USER": "",
"DRUPAL_TEMPORARY_FILES": "/tmp",
"LAGOON_ENVIRONMENT_TYPE": "local",
"LAGOON_ROUTE": "star_wars.docker.amazee.io",
"MARIADB_DATABASE": "drupal",
"MARIADB_HOST": "mariadb",
Expand Down
7 changes: 0 additions & 7 deletions .scaffold/tests/bats/fixtures/docker-compose.env_mod.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
"DRUPAL_SHIELD_PASS": "passw",
"DRUPAL_SHIELD_USER": "jane",
"DRUPAL_TEMPORARY_FILES": "/tmp",
"LAGOON_ENVIRONMENT_TYPE": "development",
"LAGOON_ROUTE": "the_matrix.docker.amazee.io",
"MARIADB_DATABASE": "drupal",
"MARIADB_HOST": "mariadb",
Expand Down Expand Up @@ -78,7 +77,6 @@
"DRUPAL_SHIELD_PASS": "passw",
"DRUPAL_SHIELD_USER": "jane",
"DRUPAL_TEMPORARY_FILES": "/tmp",
"LAGOON_ENVIRONMENT_TYPE": "development",
"LAGOON_ROUTE": "the_matrix.docker.amazee.io",
"MARIADB_DATABASE": "drupal",
"MARIADB_HOST": "mariadb",
Expand Down Expand Up @@ -127,7 +125,6 @@
"DRUPAL_SHIELD_PASS": "passw",
"DRUPAL_SHIELD_USER": "jane",
"DRUPAL_TEMPORARY_FILES": "/tmp",
"LAGOON_ENVIRONMENT_TYPE": "development",
"LAGOON_ROUTE": "the_matrix.docker.amazee.io",
"MARIADB_DATABASE": "drupal",
"MARIADB_HOST": "mariadb",
Expand Down Expand Up @@ -183,7 +180,6 @@
"DRUPAL_SHIELD_PASS": "passw",
"DRUPAL_SHIELD_USER": "jane",
"DRUPAL_TEMPORARY_FILES": "/tmp",
"LAGOON_ENVIRONMENT_TYPE": "development",
"LAGOON_ROUTE": "the_matrix.docker.amazee.io",
"MARIADB_DATABASE": "drupal",
"MARIADB_HOST": "mariadb",
Expand Down Expand Up @@ -240,7 +236,6 @@
"DRUPAL_SHIELD_PASS": "passw",
"DRUPAL_SHIELD_USER": "jane",
"DRUPAL_TEMPORARY_FILES": "/tmp",
"LAGOON_ENVIRONMENT_TYPE": "development",
"LAGOON_ROUTE": "the_matrix.docker.amazee.io",
"MARIADB_DATABASE": "drupal",
"MARIADB_HOST": "mariadb",
Expand Down Expand Up @@ -303,7 +298,6 @@
"DRUPAL_SHIELD_PASS": "passw",
"DRUPAL_SHIELD_USER": "jane",
"DRUPAL_TEMPORARY_FILES": "/tmp",
"LAGOON_ENVIRONMENT_TYPE": "development",
"LAGOON_ROUTE": "the_matrix.docker.amazee.io",
"MARIADB_DATABASE": "drupal",
"MARIADB_HOST": "mariadb",
Expand Down Expand Up @@ -376,7 +370,6 @@
"DRUPAL_SHIELD_PASS": "passw",
"DRUPAL_SHIELD_USER": "jane",
"DRUPAL_TEMPORARY_FILES": "/tmp",
"LAGOON_ENVIRONMENT_TYPE": "development",
"LAGOON_ROUTE": "the_matrix.docker.amazee.io",
"MARIADB_DATABASE": "drupal",
"MARIADB_HOST": "mariadb",
Expand Down
7 changes: 0 additions & 7 deletions .scaffold/tests/bats/fixtures/docker-compose.noenv.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
"DRUPAL_SHIELD_PASS": "",
"DRUPAL_SHIELD_USER": "",
"DRUPAL_TEMPORARY_FILES": "/tmp",
"LAGOON_ENVIRONMENT_TYPE": "local",
"LAGOON_ROUTE": "star_wars.docker.amazee.io",
"MARIADB_DATABASE": "drupal",
"MARIADB_HOST": "mariadb",
Expand Down Expand Up @@ -78,7 +77,6 @@
"DRUPAL_SHIELD_PASS": "",
"DRUPAL_SHIELD_USER": "",
"DRUPAL_TEMPORARY_FILES": "/tmp",
"LAGOON_ENVIRONMENT_TYPE": "local",
"LAGOON_ROUTE": "star_wars.docker.amazee.io",
"MARIADB_DATABASE": "drupal",
"MARIADB_HOST": "mariadb",
Expand Down Expand Up @@ -127,7 +125,6 @@
"DRUPAL_SHIELD_PASS": "",
"DRUPAL_SHIELD_USER": "",
"DRUPAL_TEMPORARY_FILES": "/tmp",
"LAGOON_ENVIRONMENT_TYPE": "local",
"LAGOON_ROUTE": "star_wars.docker.amazee.io",
"MARIADB_DATABASE": "drupal",
"MARIADB_HOST": "mariadb",
Expand Down Expand Up @@ -183,7 +180,6 @@
"DRUPAL_SHIELD_PASS": "",
"DRUPAL_SHIELD_USER": "",
"DRUPAL_TEMPORARY_FILES": "/tmp",
"LAGOON_ENVIRONMENT_TYPE": "local",
"LAGOON_ROUTE": "star_wars.docker.amazee.io",
"MARIADB_DATABASE": "drupal",
"MARIADB_HOST": "mariadb",
Expand Down Expand Up @@ -240,7 +236,6 @@
"DRUPAL_SHIELD_PASS": "",
"DRUPAL_SHIELD_USER": "",
"DRUPAL_TEMPORARY_FILES": "/tmp",
"LAGOON_ENVIRONMENT_TYPE": "local",
"LAGOON_ROUTE": "star_wars.docker.amazee.io",
"MARIADB_DATABASE": "drupal",
"MARIADB_HOST": "mariadb",
Expand Down Expand Up @@ -303,7 +298,6 @@
"DRUPAL_SHIELD_PASS": "",
"DRUPAL_SHIELD_USER": "",
"DRUPAL_TEMPORARY_FILES": "/tmp",
"LAGOON_ENVIRONMENT_TYPE": "local",
"LAGOON_ROUTE": "star_wars.docker.amazee.io",
"MARIADB_DATABASE": "drupal",
"MARIADB_HOST": "mariadb",
Expand Down Expand Up @@ -376,7 +370,6 @@
"DRUPAL_SHIELD_PASS": "",
"DRUPAL_SHIELD_USER": "",
"DRUPAL_TEMPORARY_FILES": "/tmp",
"LAGOON_ENVIRONMENT_TYPE": "local",
"LAGOON_ROUTE": "star_wars.docker.amazee.io",
"MARIADB_DATABASE": "drupal",
"MARIADB_HOST": "mariadb",
Expand Down
4 changes: 0 additions & 4 deletions docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,6 @@ x-environment: &default-environment
# Redis integration flag.
DRUPAL_REDIS_ENABLED: ${DRUPAL_REDIS_ENABLED:-}
#;> REDIS
#;< LAGOON
# Lagoon environment type.
LAGOON_ENVIRONMENT_TYPE: ${LAGOON_ENVIRONMENT_TYPE:-local}
#;> LAGOON

# ------------------------------------------------------------------------------
# Services.
Expand Down
Loading

1 comment on commit c7f74a7

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎉 Published on https://drevops-scaffold-docs.netlify.app as production
🚀 Deployed on https://66bfe77d4e5489d3a08ced51--drevops-scaffold-docs.netlify.app

Please sign in to comment.