Skip to content

Commit

Permalink
chore(infra): update docker config
Browse files Browse the repository at this point in the history
  • Loading branch information
n3wborn committed Feb 7, 2024
1 parent 029394b commit 533e2db
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
5 changes: 1 addition & 4 deletions compose.override.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@ services:
- ./docker/frankenphp/Caddyfile:/etc/caddy/Caddyfile:ro
- ./docker/frankenphp/conf.d/app.dev.ini:/usr/local/etc/php/conf.d/app.dev.ini:ro
environment:
MERCURE_EXTRA_DIRECTIVES: demo
# See https://xdebug.org/docs/all_settings#mode
XDEBUG_MODE: "${XDEBUG_MODE:-off}"
TRUSTED_HOSTS: ^${SERVER_NAME:-project-manager\.localhost|localhost}|php$$
SERVER_NAME: ${SERVER_NAME:-project-manager\.localhost}, php:80
DATABASE_URL: postgresql://user:password@database:5432/db_name?serverVersion=15&charset=${POSTGRES_CHARSET:-utf8}
POSTGRES_DB: db_name
extra_hosts:
Expand Down
5 changes: 0 additions & 5 deletions compose.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
version: "3.4"

services:
php:
image: ${IMAGES_PREFIX:-}app-php
restart: unless-stopped
environment:
SERVER_NAME: ${SERVER_NAME:-project-manager.localhost}, php:80
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:-project-manager\.localhost|localhost}|php$$
DATABASE_URL: postgresql://user:password@database:5432/db_name?serverVersion=${POSTGRES_VERSION:-15}&charset=${POSTGRES_CHARSET:-utf8}
POSTGRES_DB: db_name
MERCURE_URL: ${CADDY_MERCURE_URL:-http://php/.well-known/mercure}
MERCURE_PUBLIC_URL: https://${SERVER_NAME:-project-manager\.localhost}/.well-known/mercure
MERCURE_JWT_SECRET: ${CADDY_MERCURE_JWT_SECRET:-!ChangeThisMercureHubJWTSecretKey!}
Expand Down

0 comments on commit 533e2db

Please sign in to comment.