diff --git a/app/.env b/app/.env index 939f106..32fba31 100644 --- a/app/.env +++ b/app/.env @@ -25,6 +25,5 @@ APP_SECRET=0751e183ea472eb11c19f21f66a2543c # # DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db" # DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=8&charset=utf8mb4" -# DATABASE_URL="postgresql://app:!ChangeMe!@127.0.0.1:5432/app?serverVersion=14&charset=utf8" -DATABASE_URL="postgresql://postgres:secret@db:5432/postgres?serverVersion=12&charset=utf8" +DATABASE_URL="postgresql://app:!ChangeMe!@127.0.0.1:5432/app?serverVersion=15&charset=utf8" ###< doctrine/doctrine-bundle ### diff --git a/app/config/packages/doctrine.yaml b/app/config/packages/doctrine.yaml index 8fe1dd4..1bb885e 100644 --- a/app/config/packages/doctrine.yaml +++ b/app/config/packages/doctrine.yaml @@ -4,7 +4,7 @@ doctrine: # IMPORTANT: You MUST configure your server version, # either here or in the DATABASE_URL env var (see .env file) - #server_version: '13' + #server_version: '15' orm: auto_generate_proxy_classes: true naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware @@ -26,6 +26,7 @@ when@prod: doctrine: orm: auto_generate_proxy_classes: false + proxy_dir: '%kernel.build_dir%/doctrine/orm/Proxies' query_cache_driver: type: pool pool: doctrine.system_cache_pool diff --git a/app/docker-compose.yml b/app/docker-compose.yml index 8aa1121..1067b9c 100644 --- a/app/docker-compose.yml +++ b/app/docker-compose.yml @@ -3,19 +3,19 @@ version: '3' services: ###> doctrine/doctrine-bundle ### database: - image: postgres:${POSTGRES_VERSION:-14}-alpine + image: postgres:${POSTGRES_VERSION:-15}-alpine environment: POSTGRES_DB: ${POSTGRES_DB:-app} # You should definitely change the password in production POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-!ChangeMe!} POSTGRES_USER: ${POSTGRES_USER:-app} volumes: - - db-data:/var/lib/postgresql/data:rw + - database_data:/var/lib/postgresql/data:rw # You may use a bind-mounted host directory instead, so that it is harder to accidentally remove the volume and lose all your data! # - ./docker/db/data:/var/lib/postgresql/data:rw ###< doctrine/doctrine-bundle ### volumes: ###> doctrine/doctrine-bundle ### - db-data: + database_data: ###< doctrine/doctrine-bundle ### diff --git a/app/symfony.lock b/app/symfony.lock index e07bc94..fe3e120 100644 --- a/app/symfony.lock +++ b/app/symfony.lock @@ -17,7 +17,7 @@ "repo": "github.com/symfony/recipes", "branch": "main", "version": "2.4", - "ref": "da713d006953b90d1c085c1be480ecdd6c4a95e0" + "ref": "013b823e7fee65890b23e40f31e6667a1ac519ac" }, "files": [ "config/packages/doctrine.yaml",