Commit4433747

committed

Merge branch '6.0' into 6.1

* 6.0: [docker] fix composer `extra` variable name

2 parents643c62e +3f609ff commit4433747Copy full SHA for 4433747

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -26,7 +26,7 @@ your ``docker-compose.yml`` file will automatically be updated to include a
`26`	`26`
`27`	`27`	`The first time you install a recipe containing Docker config, Flex will ask you`
`28`	`28`	if you want to include it. Or, you can set your preference in ``composer.json``,
`29`		-by setting the ``symfony.extra.docker`` config to ``true`` or ``false``.
	`29`	+by setting the ``extra.symfony.docker`` config to ``true`` or ``false``.
`30`	`30`
`31`	`31`	Some recipes also include additions to your ``Dockerfile``. To get those changes,
`32`	`32`	you need to already have a ``Dockerfile`` at the root of your app with the

Comments

(0)