Skip to content

Commit f3d9113

Browse files
committed
Replace old docker compose filename
docker-compose.yml/yaml to compose.yaml
1 parent bdd7fe6 commit f3d9113

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

.doctor-rst.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ whitelist:
9393
- '/``.yml``/'
9494
- '/(.*)\.orm\.yml/' # currently DoctrineBundle only supports .yml
9595
- /docker-compose\.yml/
96+
- /compose\.yaml/
9697
lines:
9798
- 'in config files, so the old ``app/config/config_dev.yml`` goes to'
9899
- '#. The most important config file is ``app/config/services.yml``, which now is'

setup/docker.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Flex Recipes & Docker Configuration
1919

2020
The :ref:`Flex recipe <symfony-flex>` for some packages also include Docker configuration.
2121
For example, when you run ``composer require doctrine`` (to get ``symfony/orm-pack``),
22-
your ``docker-compose.yml`` file will automatically be updated to include a
22+
your ``compose.yaml`` file will automatically be updated to include a
2323
``database`` service.
2424

2525
The first time you install a recipe containing Docker config, Flex will ask you

setup/symfony_server.rst

+6-6
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ Consider the following configuration:
388388

389389
.. code-block:: yaml
390390
391-
# docker-compose.yaml
391+
# compose.yaml
392392
services:
393393
database:
394394
ports: [3306]
@@ -401,12 +401,12 @@ variables accordingly with the service name (``database``) as a prefix:
401401
If the service is not in the supported list below, generic environment
402402
variables are set: ``PORT``, ``IP``, and ``HOST``.
403403

404-
If the ``docker-compose.yaml`` names do not match Symfony's conventions, add a
404+
If the ``compose.yaml`` names do not match Symfony's conventions, add a
405405
label to override the environment variables prefix:
406406

407407
.. code-block:: yaml
408408
409-
# docker-compose.yaml
409+
# compose.yaml
410410
services:
411411
db:
412412
ports: [3306]
@@ -471,7 +471,7 @@ check the "Symfony Server" section in the web debug toolbar; you'll see that
471471

472472
.. code-block:: yaml
473473
474-
# docker-compose.yaml
474+
# compose.yaml
475475
services:
476476
db:
477477
ports: [3306]
@@ -485,10 +485,10 @@ its location, same as for ``docker-compose``:
485485
.. code-block:: bash
486486
487487
# start your containers:
488-
COMPOSE_FILE=docker/docker-compose.yaml COMPOSE_PROJECT_NAME=project_name docker-compose up -d
488+
COMPOSE_FILE=docker/compose.yaml COMPOSE_PROJECT_NAME=project_name docker-compose up -d
489489
490490
# run any Symfony CLI command:
491-
COMPOSE_FILE=docker/docker-compose.yaml COMPOSE_PROJECT_NAME=project_name symfony var:export
491+
COMPOSE_FILE=docker/compose.yaml COMPOSE_PROJECT_NAME=project_name symfony var:export
492492
493493
.. note::
494494

0 commit comments

Comments
 (0)