Skip to content

Commit ae172b9

Browse files
author
symfony-flex-server[bot]
authored
Merge pull request #113
2 parents af59c6f + 9730ab4 commit ae172b9

File tree

2 files changed

+34
-3
lines changed

2 files changed

+34
-3
lines changed

doctrine/doctrine-bundle/1.6/manifest.json

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,39 @@
99
"env": {
1010
"#1": "Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url",
1111
"#2": "For an SQLite database, use: \"sqlite:///%kernel.project_dir%/var/data.db\"",
12-
"#3": "For a PostgreSQL database, use: \"postgresql://db_user:db_password@127.0.0.1:5432/db_name?serverVersion=11&charset=utf8\"",
12+
"#3": "For a MySQL database, use: \"mysql://db_user:db_password@127.0.0.1:3306/db_name?serverVersion=5.7\"",
1313
"#4": "IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml",
14-
"DATABASE_URL": "mysql://db_user:db_password@127.0.0.1:3306/db_name?serverVersion=5.7"
14+
"DATABASE_URL": "postgresql://db_user:db_password@127.0.0.1:5432/db_name?serverVersion=13&charset=utf8"
15+
},
16+
"dockerfile": [
17+
"RUN apk add --no-cache --virtual .pgsql-deps postgresql-dev; \\",
18+
"\tdocker-php-ext-install -j$(nproc) pdo_pgsql; \\",
19+
"\tapk add --no-cache --virtual .pgsql-rundeps so:libpq.so.5; \\",
20+
"\tapk del .pgsql-deps"
21+
],
22+
"docker-compose": {
23+
"docker-compose.yml": {
24+
"services": [
25+
"database:",
26+
" image: postgres:${POSTGRES_VERSION:-13}-alpine",
27+
" environment:",
28+
" POSTGRES_DB: ${POSTGRES_DB:-app}",
29+
" # You should definitely change the password in production",
30+
" POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-ChangeMe}",
31+
" POSTGRES_USER: ${POSTGRES_USER:-symfony}",
32+
" volumes:",
33+
" - db-data:/var/lib/postgresql/data:rw",
34+
" # You may use a bind-mounted host directory instead, so that it is harder to accidentally remove the volume and lose all your data!",
35+
" # - ./docker/db/data:/var/lib/postgresql/data:rw"
36+
],
37+
"volumes": ["db-data:"]
38+
},
39+
"docker-compose.override.yml": {
40+
"services": [
41+
"db:",
42+
" ports:",
43+
" - \"5432\""
44+
]
45+
}
1546
}
1647
}

doctrine/doctrine-bundle/2.0/config/packages/doctrine.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ doctrine:
44

55
# IMPORTANT: You MUST configure your server version,
66
# either here or in the DATABASE_URL env var (see .env file)
7-
#server_version: '5.7'
7+
#server_version: '13'
88
orm:
99
auto_generate_proxy_classes: true
1010
naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware

0 commit comments

Comments
 (0)