Skip to content

Commit

Permalink
Merge pull request #481 from City-of-Helsinki/update-configuration
Browse files Browse the repository at this point in the history
Automatic update
  • Loading branch information
rpnykanen authored Jun 3, 2024
2 parents 8149fa1 + ec22306 commit 98faed1
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 41 deletions.
9 changes: 0 additions & 9 deletions compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,12 @@ services:
DRUPAL_VARNISH_PORT: 6081
REDIS_HOST: redis
PROJECT_NAME: "${PROJECT_NAME}"
# Uncomment to enable Hakuvahti:
# HAKUVAHTI_URL: "${HAKUVAHTI_URL}"
extra_hosts:
- "host.docker.internal:host-gateway"
- "${DRUPAL_HOSTNAME}:host-gateway"
networks:
- internal
- stonehenge-network
# Uncomment to enable Hakuvahti:
# - helfi-hakuvahti_helfi-hakuvahti-network
labels:
- "traefik.enable=true"
- "traefik.http.routers.${COMPOSE_PROJECT_NAME}-app.entrypoints=https"
Expand Down Expand Up @@ -143,8 +139,6 @@ services:
networks:
- internal
- stonehenge-network
# Uncomment to enable Hakuvahti:
# - helfi-hakuvahti_helfi-hakuvahti-network
labels:
- "traefik.enable=true"
- "traefik.http.routers.${COMPOSE_PROJECT_NAME}-elastic.entrypoints=https"
Expand Down Expand Up @@ -179,9 +173,6 @@ networks:
external: false
stonehenge-network:
external: true
# Uncomment to enable Hakuvahti:
# helfi-hakuvahti_helfi-hakuvahti-network:
# external: true

volumes:
db_volume:
Expand Down
65 changes: 33 additions & 32 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 98faed1

Please sign in to comment.