Skip to content

Commit

Permalink
Make TLD configurable
Browse files Browse the repository at this point in the history
The TLD used depends on the developers setup, some use `docker`,
others `local`, so make it configurable.
  • Loading branch information
xendk committed Jan 6, 2025
1 parent e9c4a27 commit 07e1ccb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docker-compose.ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ services:
- 80
- 443
environment:
VIRTUAL_HOST: wiremock.${COMPOSE_PROJECT_NAME}.docker
VIRTUAL_HOST: wiremock.${COMPOSE_PROJECT_NAME}.${DEV_TLD:-docker}
VIRTUAL_PORT: 80

cli:
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ x-user:
x-environment:
&default-environment
# The php cli container needs this to be defined. Otherwise it is not possible to execute drush commands.
LAGOON_ROUTE: &default-url http://${COMPOSE_PROJECT_NAME}.docker
LAGOON_ROUTE: &default-url http://${COMPOSE_PROJECT_NAME}.${DEV_TLD:-docker}
# Environment variables which mimic what will be set in a Lagoon cluster locally
LAGOON_PROJECT: 'dplcms'
LAGOON_ENVIRONMENT: 'local'
Expand All @@ -52,7 +52,7 @@ services:
<< : *default-environment
# VARNISH_BYPASS: "true" # Add this to disable caching in varnish.
# Is used by [nginx-proxy](https://github.com/nginx-proxy/nginx-proxy) or [dory](https://github.com/FreedomBen/dory)
VIRTUAL_HOST: ${COMPOSE_PROJECT_NAME}-varnish.docker
VIRTUAL_HOST: ${COMPOSE_PROJECT_NAME}-varnish.${DEV_TLD:-docker}
VIRTUAL_PORT: 8080

cli: # cli container, will be used for executing composer and any local commands (drush, drupal, etc.)
Expand Down Expand Up @@ -87,7 +87,7 @@ services:
environment:
<< : *default-environment # loads the defined environment variables from the top
# Route that should be used locally.
VIRTUAL_HOST: nginx.${COMPOSE_PROJECT_NAME}.docker
VIRTUAL_HOST: nginx.${COMPOSE_PROJECT_NAME}.${DEV_TLD:-docker}
labels:
lagoon.type: nginx-php-persistent
lagoon.persistent: /app/web/sites/default/files/ # define where the persistent storage should be mounted too
Expand Down

0 comments on commit 07e1ccb

Please sign in to comment.