Skip to content

Commit d83f9ea

Browse files
authored
Merge pull request #2744 from tarlepp/chore(env)/docker-compose-v2
Chore(env) - Upgrade to Docker Compose v2
2 parents eaf9135 + 442dc69 commit d83f9ea

File tree

12 files changed

+68
-70
lines changed

12 files changed

+68
-70
lines changed

.dockerignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
###< symfony/framework-bundle ###
99

1010
/secrets/application.*.json
11-
docker-compose.*.yml
11+
compose.*.yaml
1212

1313
# User-specific stuff:
1414
.idea/**/workspace.xml

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
###< symfony/framework-bundle ###
1010

1111
/secrets/application.*.json
12-
docker-compose.*.yml
12+
compose.*.yaml
1313

1414
## File-based project format:
1515
*.iws

Dockerfile_dev

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM php:8.3.6-fpm
33
# Let's use bash as a default shell with login each time
44
SHELL ["/bin/bash", "--login", "-c"]
55

6-
# Decrale used arguments from `docker-compose.yml` file
6+
# Decrale used arguments from `compose.yaml` file
77
ARG HOST_UID
88
ARG HOST_GID
99

@@ -77,7 +77,7 @@ RUN composer completion bash > /etc/bash_completion.d/composer
7777

7878
# Copy development `php.ini` and PHP-FPM pool configuration to container
7979
#
80-
# Also note that these files mounted within `docker-compose.yml` file, so
80+
# Also note that these files mounted within `compose.yaml` file, so
8181
# you don't need to build containers again if you change something just
8282
# restart containers and you're good
8383
COPY ./docker/php/php-dev.ini /usr/local/etc/php/php.ini

0 commit comments

Comments
 (0)