Skip to content

Commit 6cd5f2f

Browse files
committed
Updated documentation to use Docker Compose version 2
1 parent c6448cb commit 6cd5f2f

File tree

5 files changed

+7
-8
lines changed

5 files changed

+7
-8
lines changed

doc/COMMANDS.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ OR
2828
make fish
2929
```
3030

31-
That command is shortcut for `docker-compose exec php bash/fish` command and
31+
That command is shortcut for `docker compose exec php bash/fish` command and
3232
you can use that command within your host machine. Note that default user
3333
inside that `php` container is `dev` and it has been bind to your host machine
3434
user and group (uid = 1000, gid = 1000) - so that you don't have issues within
@@ -41,7 +41,7 @@ uid = 1000
4141
gid = 1000
4242
```
4343

44-
You need to create `docker-compose.override.yml` file and specify used user
44+
You need to create `compose.override.yaml` file and specify used user
4545
information there.
4646

4747
### Makefile [](#table-of-contents)

doc/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ application.
1818
* [Development guide](DEVELOPMENT.md)
1919
* [Installation without docker](INSTALLATION_WITHOUT_DOCKER.md)
2020
* [PhpStorm configuration](PHPSTORM.md)
21-
* [Speed problems with docker-compose?](SPEED_UP_DOCKER_COMPOSE.md)
21+
* [Speed problems with Docker Engige?](SPEED_UP_DOCKER_COMPOSE.md)
2222
* [Testing guide](TESTING.md)
2323
* [Usage checklist](USAGE_CHECKLIST.md)
2424
* [Using Xdebug](XDEBUG.md)

doc/SPEED_UP_DOCKER_COMPOSE.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# What is this?
22

3-
This document contains information about how you can speed up docker-compose
3+
This document contains information about how you can speed up Docker Engine
44
usage in development stage.
55

66
## Table of Contents
@@ -61,14 +61,13 @@ website.
6161

6262
### Configuration [](#table-of-contents)
6363

64-
Create a `docker-compose.override.yml` file with following content:
64+
Create a `compose.override.yaml` file with following content:
6565

6666
```yaml
6767
#
6868
# This file should NOT be added to your VCS, only purpose of this is to
6969
# override those volumes with docker-sync.yml config
7070
#
71-
version: '3'
7271
services:
7372
php:
7473
volumes:

doc/USAGE_CHECKLIST.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ started to use this template.
4141
- and made necessary changes.
4242
* [ ] [favicon.ico](../public/favicon.ico) - change your application favicon
4343
to match your brand.
44-
* [ ] [docker-compose.yml](../docker-compose.yml) Change `container_name` to
44+
* [ ] [compose.yaml](../compose.yaml) Change `container_name` to
4545
match your application.
4646
* [ ] [mysql_custom.cnf](../docker/mysql/mysql_custom.cnf) Check that MySQL
4747
has custom configuration that your application needs. Also check that

doc/XDEBUG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ local paths. See the image below:
7171

7272
By default this application assumes that you're using `app.localhost` as your
7373
PHP server that you've configured to your IDE. If you need to change that, just
74-
override that in your local `docker-compose.override.yml` file.
74+
override that in your local `compose.override.yaml` file.
7575

7676
See those [External links / resources](#external-links--resources-table-of-contents)
7777
on this documentation to get more information.

0 commit comments

Comments
 (0)