Updated recipes to update docker related files

This commit is contained in:
Jan Böhmer 2024-03-10 18:08:22 +01:00
parent 19967bd42e
commit 8d816ab1ee
6 changed files with 85 additions and 41 deletions

View file

@ -35,6 +35,9 @@ RUN set -eux; \
ENV COMPOSER_ALLOW_SUPERUSER=1 ENV COMPOSER_ALLOW_SUPERUSER=1
###> recipes ### ###> recipes ###
###> doctrine/doctrine-bundle ###
RUN install-php-extensions pdo_pgsql
###< doctrine/doctrine-bundle ###
###< recipes ### ###< recipes ###
COPY --link frankenphp/conf.d/app.ini $PHP_INI_DIR/conf.d/ COPY --link frankenphp/conf.d/app.ini $PHP_INI_DIR/conf.d/

View file

@ -22,3 +22,20 @@ services:
###> symfony/mercure-bundle ### ###> symfony/mercure-bundle ###
###< symfony/mercure-bundle ### ###< symfony/mercure-bundle ###
###> doctrine/doctrine-bundle ###
database:
ports:
- "5432"
###< doctrine/doctrine-bundle ###
###> symfony/mailer ###
mailer:
image: axllent/mailpit
ports:
- "1025"
- "8025"
environment:
MP_SMTP_AUTH_ACCEPT_ANY: 1
MP_SMTP_AUTH_ALLOW_INSECURE: 1
###< symfony/mailer ###

View file

@ -38,8 +38,26 @@ services:
###> symfony/mercure-bundle ### ###> symfony/mercure-bundle ###
###< symfony/mercure-bundle ### ###< symfony/mercure-bundle ###
###> doctrine/doctrine-bundle ###
database:
image: postgres:${POSTGRES_VERSION:-16}-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:
- 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: volumes:
caddy_data: caddy_data:
caddy_config: caddy_config:
###> symfony/mercure-bundle ### ###> symfony/mercure-bundle ###
###< symfony/mercure-bundle ### ###< symfony/mercure-bundle ###
###> doctrine/doctrine-bundle ###
database_data:
###< doctrine/doctrine-bundle ###

View file

@ -165,7 +165,8 @@
"extra": { "extra": {
"symfony": { "symfony": {
"allow-contrib": false, "allow-contrib": false,
"require": "6.4.*" "require": "6.4.*",
"docker": true
} }
} }
} }

View file

@ -0,0 +1,5 @@
when@test:
dama_doctrine_test:
enable_static_connection: true
enable_static_meta_data_cache: true
enable_static_query_cache: true

View file

@ -44,15 +44,15 @@
"version": "1.3.3" "version": "1.3.3"
}, },
"dama/doctrine-test-bundle": { "dama/doctrine-test-bundle": {
"version": "7.2", "version": "8.0",
"recipe": { "recipe": {
"repo": "github.com/symfony/recipes-contrib", "repo": "github.com/symfony/recipes-contrib",
"branch": "main", "branch": "main",
"version": "4.0", "version": "7.2",
"ref": "2c920f73a217f30bd4a37833c91071f4d3dc1ecd" "ref": "896306d79d4ee143af9eadf9b09fd34a8c391b70"
}, },
"files": [ "files": [
"config/packages/test/dama_doctrine_test_bundle.yaml" "./config/packages/dama_doctrine_test_bundle.yaml"
] ]
}, },
"dnoegel/php-xdg-base-dir": { "dnoegel/php-xdg-base-dir": {
@ -92,12 +92,12 @@
"repo": "github.com/symfony/recipes", "repo": "github.com/symfony/recipes",
"branch": "main", "branch": "main",
"version": "2.10", "version": "2.10",
"ref": "0db4b12b5df45f5122213b4ecd18733ab7fa7d53" "ref": "c170ded8fc587d6bd670550c43dafcf093762245"
}, },
"files": [ "files": [
"config/packages/doctrine.yaml", "./config/packages/doctrine.yaml",
"src/Entity/.gitignore", "./src/Entity/.gitignore",
"src/Repository/.gitignore" "./src/Repository/.gitignore"
] ]
}, },
"doctrine/doctrine-fixtures-bundle": { "doctrine/doctrine-fixtures-bundle": {
@ -174,7 +174,7 @@
"version": "3.5.0" "version": "3.5.0"
}, },
"florianv/swap-bundle": { "florianv/swap-bundle": {
"version": "5.0.0" "version": "5.0.x-dev"
}, },
"friendsofphp/proxy-manager-lts": { "friendsofphp/proxy-manager-lts": {
"version": "v1.0.5" "version": "v1.0.5"
@ -183,16 +183,16 @@
"version": "v1.1.7" "version": "v1.1.7"
}, },
"gregwar/captcha-bundle": { "gregwar/captcha-bundle": {
"version": "v2.0.6" "version": "v2.2.0"
}, },
"imagine/imagine": { "imagine/imagine": {
"version": "1.2.2" "version": "1.2.2"
}, },
"jbtronics/2fa-webauthn": { "jbtronics/2fa-webauthn": {
"version": "dev-master" "version": "v2.2.1"
}, },
"jbtronics/dompdf-font-loader-bundle": { "jbtronics/dompdf-font-loader-bundle": {
"version": "dev-main" "version": "v1.1.1"
}, },
"knpuniversity/oauth2-client-bundle": { "knpuniversity/oauth2-client-bundle": {
"version": "2.15", "version": "2.15",
@ -232,7 +232,7 @@
"version": "1.24.0" "version": "1.24.0"
}, },
"nbgrp/onelogin-saml-bundle": { "nbgrp/onelogin-saml-bundle": {
"version": "v1.3.2" "version": "v1.4.0"
}, },
"nelmio/cors-bundle": { "nelmio/cors-bundle": {
"version": "2.3", "version": "2.3",
@ -451,7 +451,7 @@
"version": "3.0.2" "version": "3.0.2"
}, },
"shivas/versioning-bundle": { "shivas/versioning-bundle": {
"version": "3.1.3" "version": "4.0.3"
}, },
"symfony/apache-pack": { "symfony/apache-pack": {
"version": "1.0", "version": "1.0",
@ -459,10 +459,10 @@
"repo": "github.com/symfony/recipes-contrib", "repo": "github.com/symfony/recipes-contrib",
"branch": "main", "branch": "main",
"version": "1.0", "version": "1.0",
"ref": "efb318193e48384eb5c5aadff15396ed698f8ffc" "ref": "0f18b4decdf5695d692c1d0dfd65516a07a6adf1"
}, },
"files": [ "files": [
"public/.htaccess" "./public/.htaccess"
] ]
}, },
"symfony/asset": { "symfony/asset": {
@ -590,15 +590,15 @@
"version": "v4.2.3" "version": "v4.2.3"
}, },
"symfony/mailer": { "symfony/mailer": {
"version": "5.4", "version": "6.4",
"recipe": { "recipe": {
"repo": "github.com/symfony/recipes", "repo": "github.com/symfony/recipes",
"branch": "main", "branch": "main",
"version": "4.3", "version": "4.3",
"ref": "2bf89438209656b85b9a49238c4467bff1b1f939" "ref": "df66ee1f226c46f01e85c29c2f7acce0596ba35a"
}, },
"files": [ "files": [
"config/packages/mailer.yaml" "./config/packages/mailer.yaml"
] ]
}, },
"symfony/maker-bundle": { "symfony/maker-bundle": {
@ -617,12 +617,12 @@
"version": "v4.4.2" "version": "v4.4.2"
}, },
"symfony/monolog-bundle": { "symfony/monolog-bundle": {
"version": "3.7", "version": "3.10",
"recipe": { "recipe": {
"repo": "github.com/symfony/recipes", "repo": "github.com/symfony/recipes",
"branch": "master", "branch": "main",
"version": "3.7", "version": "3.7",
"ref": "213676c4ec929f046dfde5ea8e97625b81bc0578" "ref": "aff23899c4440dd995907613c1dd709b6f59503f"
}, },
"files": [ "files": [
"./config/packages/monolog.yaml" "./config/packages/monolog.yaml"
@ -640,13 +640,13 @@
"repo": "github.com/symfony/recipes", "repo": "github.com/symfony/recipes",
"branch": "main", "branch": "main",
"version": "6.3", "version": "6.3",
"ref": "1f5830c331065b6e4c9d5fa2105e322d29fcd573" "ref": "a411a0480041243d97382cac7984f7dce7813c08"
}, },
"files": [ "files": [
".env.test", "./.env.test",
"bin/phpunit", "./bin/phpunit",
"phpunit.xml.dist", "./phpunit.xml.dist",
"tests/bootstrap.php" "./tests/bootstrap.php"
] ]
}, },
"symfony/polyfill-ctype": { "symfony/polyfill-ctype": {
@ -730,12 +730,12 @@
"version": "v1.1.5" "version": "v1.1.5"
}, },
"symfony/stimulus-bundle": { "symfony/stimulus-bundle": {
"version": "2.9", "version": "2.16",
"recipe": { "recipe": {
"repo": "github.com/symfony/recipes", "repo": "github.com/symfony/recipes",
"branch": "main", "branch": "main",
"version": "2.9", "version": "2.13",
"ref": "05c45071c7ecacc1e48f94bc43c1f8d4405fb2b2" "ref": "6acd9ff4f7fd5626d2962109bd4ebab351d43c43"
}, },
"files": [ "files": [
"./assets/bootstrap.js", "./assets/bootstrap.js",
@ -755,11 +755,11 @@
"repo": "github.com/symfony/recipes", "repo": "github.com/symfony/recipes",
"branch": "main", "branch": "main",
"version": "6.3", "version": "6.3",
"ref": "64fe617084223633e1dedf9112935d8c95410d3e" "ref": "e28e27f53663cc34f0be2837aba18e3a1bef8e7b"
}, },
"files": [ "files": [
"config/packages/translation.yaml", "./config/packages/translation.yaml",
"translations/.gitignore" "./translations/.gitignore"
] ]
}, },
"symfony/translation-contracts": { "symfony/translation-contracts": {
@ -769,16 +769,16 @@
"version": "v4.2.3" "version": "v4.2.3"
}, },
"symfony/twig-bundle": { "symfony/twig-bundle": {
"version": "6.3", "version": "6.4",
"recipe": { "recipe": {
"repo": "github.com/symfony/recipes", "repo": "github.com/symfony/recipes",
"branch": "main", "branch": "main",
"version": "6.3", "version": "6.4",
"ref": "b7772eb20e92f3fb4d4fe756e7505b4ba2ca1a2c" "ref": "cab5fd2a13a45c266d45a7d9337e28dee6272877"
}, },
"files": [ "files": [
"config/packages/twig.yaml", "./config/packages/twig.yaml",
"templates/base.html.twig" "./templates/base.html.twig"
] ]
}, },
"symfony/uid": { "symfony/uid": {
@ -809,7 +809,7 @@
] ]
}, },
"symfony/ux-turbo": { "symfony/ux-turbo": {
"version": "v2.0.1" "version": "v2.16.0"
}, },
"symfony/validator": { "symfony/validator": {
"version": "5.4", "version": "5.4",
@ -880,7 +880,7 @@
"version": "v3.0.0" "version": "v3.0.0"
}, },
"twig/extra-bundle": { "twig/extra-bundle": {
"version": "v3.0.0" "version": "v3.8.0"
}, },
"twig/html-extra": { "twig/html-extra": {
"version": "v3.0.3" "version": "v3.0.3"