Merge pull request #841 from symfony/docker-compose-fix

Fix docker-compose recipes
This commit is contained in:
Fabien Potencier
2020-11-13 17:59:56 +01:00
committed by GitHub
3 changed files with 18 additions and 46 deletions

View File

@@ -12,20 +12,22 @@
"MERCURE_JWT_TOKEN": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJtZXJjdXJlIjp7InB1Ymxpc2giOltdfX0.Oo0yg7y4yMa1vr_bziltxuTCqb8JVHKxp-f_FwwOim0"
},
"docker-compose": {
"services": [
"mercure:",
" # In production, you may want to use the managed version of Mercure, https://mercure.rocks",
" image: dunglas/mercure",
" environment:",
" # You should definitely change all these values in production",
" - JWT_KEY=!ChangeMe!",
" - ALLOW_ANONYMOUS=1",
" - CORS_ALLOWED_ORIGINS=*",
" - PUBLISH_ALLOWED_ORIGINS=http://localhost:1337",
" - DEMO=1",
" ports:",
" - \"1337:80\""
]
"docker-compose.yml": {
"services": [
"mercure:",
" # In production, you may want to use the managed version of Mercure, https://mercure.rocks",
" image: dunglas/mercure",
" environment:",
" # You should definitely change all these values in production",
" - JWT_KEY=!ChangeMe!",
" - ALLOW_ANONYMOUS=1",
" - CORS_ALLOWED_ORIGINS=*",
" - PUBLISH_ALLOWED_ORIGINS=http://localhost:1337",
" - DEMO=1",
" ports:",
" - \"1337:80\""
]
}
},
"aliases": ["mercure"]
}

View File

@@ -5,21 +5,6 @@
"env": {
"#1": "MESSENGER_TRANSPORT_DSN=amqp://guest:guest@localhost:5672/%2f/messages"
},
"docker-compose": {
"services": [
"rabbitmq:",
" image: rabbitmq:management-alpine",
" environment:",
" # You should definitely change the password in production",
" - RABBITMQ_DEFAULT_USER=guest",
" - RABBITMQ_DEFAULT_PASS=guest",
" volumes:",
" - rabbitmq-data:/var/lib/rabbitmq",
" ports:",
" - \"5672\""
],
"volumes": ["rabbitmq-data: {}"]
},
"aliases": ["messenger"],
"conflict": {
"symfony/framework-bundle": "<4.1"

View File

@@ -4,25 +4,10 @@
},
"env": {
"#1": "Choose one of the transports below",
"#2": "MESSENGER_TRANSPORT_DSN=amqp://guest:guest@localhost:5672/%2f/messages",
"#3": "MESSENGER_TRANSPORT_DSN=doctrine://default",
"#2": "MESSENGER_TRANSPORT_DSN=doctrine://default",
"#3": "MESSENGER_TRANSPORT_DSN=amqp://guest:guest@localhost:5672/%2f/messages",
"#4": "MESSENGER_TRANSPORT_DSN=redis://localhost:6379/messages"
},
"docker-compose": {
"services": [
"rabbitmq:",
" image: rabbitmq:management-alpine",
" environment:",
" # You should definitely change the password in production",
" - RABBITMQ_DEFAULT_USER=guest",
" - RABBITMQ_DEFAULT_PASS=guest",
" volumes:",
" - rabbitmq-data:/var/lib/rabbitmq",
" ports:",
" - \"5672\""
],
"volumes": ["rabbitmq-data: {}"]
},
"aliases": ["messenger"],
"conflict": {
"symfony/framework-bundle": "<4.3"