From 29139a00fe3fea501a493cf4e6382dbf6a04e2b1 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien@potencier.org>
Date: Fri, 13 Nov 2020 17:55:47 +0100
Subject: [PATCH] Fix docker-compose recipes

---
 symfony/mercure-bundle/0.1/manifest.json | 30 +++++++++++++-----------
 symfony/messenger/4.1/manifest.json      | 15 ------------
 symfony/messenger/4.3/manifest.json      | 19 ++-------------
 3 files changed, 18 insertions(+), 46 deletions(-)

diff --git a/symfony/mercure-bundle/0.1/manifest.json b/symfony/mercure-bundle/0.1/manifest.json
index b9c57f6d..5b115fa3 100644
--- a/symfony/mercure-bundle/0.1/manifest.json
+++ b/symfony/mercure-bundle/0.1/manifest.json
@@ -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"]
 }
diff --git a/symfony/messenger/4.1/manifest.json b/symfony/messenger/4.1/manifest.json
index 243aa957..d0ff1732 100644
--- a/symfony/messenger/4.1/manifest.json
+++ b/symfony/messenger/4.1/manifest.json
@@ -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"
diff --git a/symfony/messenger/4.3/manifest.json b/symfony/messenger/4.3/manifest.json
index 10305894..dc045158 100644
--- a/symfony/messenger/4.3/manifest.json
+++ b/symfony/messenger/4.3/manifest.json
@@ -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"