Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow overriding TRUSTED_HOSTS and MERCURE_PUBLIC_URL variables #2666

Merged
merged 2 commits into from Apr 3, 2024
Merged

Allow overriding TRUSTED_HOSTS and MERCURE_PUBLIC_URL variables #2666

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4cb83ab
build(compose.yaml): allow overriding TRUSTED_HOSTS and MERCURE_PUBLI…
Mar 18, 2024
5ce07dd
Apply suggestions from code review
vincentchalamon Mar 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions compose.yaml
View file
Open in desktop
Expand Up @@ -10,10 +10,10 @@ services:
MERCURE_PUBLISHER_JWT_KEY: ${CADDY_MERCURE_JWT_SECRET:-!ChangeThisMercureHubJWTSecretKey!}
MERCURE_SUBSCRIBER_JWT_KEY: ${CADDY_MERCURE_JWT_SECRET:-!ChangeThisMercureHubJWTSecretKey!}
TRUSTED_PROXIES: ${TRUSTED_PROXIES:-127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16}
TRUSTED_HOSTS: ^${SERVER_NAME:-example\.com|localhost}|php$$
TRUSTED_HOSTS: ${TRUSTED_HOSTS:-^${SERVER_NAME:-example\.com|localhost}|php$$}
DATABASE_URL: postgresql://${POSTGRES_USER:-app}:${POSTGRES_PASSWORD:-!ChangeMe!}@database:5432/${POSTGRES_DB:-app}?serverVersion=${POSTGRES_VERSION:-16}&charset=${POSTGRES_CHARSET:-utf8}
MERCURE_URL: ${CADDY_MERCURE_URL:-http://php/.well-known/mercure}
MERCURE_PUBLIC_URL: https://${SERVER_NAME:-localhost}/.well-known/mercure
MERCURE_PUBLIC_URL: ${CADDY_MERCURE_PUBLIC_URL:-https://${SERVER_NAME:-localhost}/.well-known/mercure}
MERCURE_JWT_SECRET: ${CADDY_MERCURE_JWT_SECRET:-!ChangeThisMercureHubJWTSecretKey!}
volumes:
- caddy_data:/data
Expand All @@ -37,7 +37,7 @@ services:
environment:
NEXT_PUBLIC_ENTRYPOINT: http://php

###> doctrine/doctrine-bundle ###
###> doctrine/doctrine-bundle ###
vincentchalamon marked this conversation as resolved.
Show resolved Hide resolved
database:
image: postgres:${POSTGRES_VERSION:-16}-alpine
environment:
Expand All @@ -58,7 +58,7 @@ services:
volumes:
caddy_data:
caddy_config:
###> doctrine/doctrine-bundle ###
###> doctrine/doctrine-bundle ###
vincentchalamon marked this conversation as resolved.
Show resolved Hide resolved
db_data:
###< doctrine/doctrine-bundle ###
###> symfony/mercure-bundle ###
Expand Down