Skip to content

Commit

Permalink
update Docker
Browse files Browse the repository at this point in the history
  • Loading branch information
keradus committed Dec 21, 2021
1 parent c9f4e8b commit 13937aa
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 73 deletions.
6 changes: 1 addition & 5 deletions docker-compose.override.yaml.dist
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3.8'

services:
php-7.2: &php
php-7.4: &php
build:
args:
DOCKER_USER_ID: 1000 # replace with your user id (most likely 1000)
Expand All @@ -11,10 +11,6 @@ services:
# Required for Docker Linux until natively supported.
# See https://github.com/docker/for-linux/issues/264
host.docker.internal: 172.17.0.1
php-7.3:
<<: *php
php-7.4:
<<: *php
php-8.0:
<<: *php
php-8.1:
Expand Down
10 changes: 2 additions & 8 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,20 +1,14 @@
version: '3.8'

services:
php-7.2: &php
build: docker/php-7.2
php-7.4: &php
build: docker/php-7.4
working_dir: /app
volumes:
- .:/app
environment:
PHP_IDE_CONFIG: serverName=php-cs-fixer
PHP_CS_FIXER_ALLOW_XDEBUG: 1
php-7.3:
<<: *php
build: docker/php-7.3
php-7.4:
<<: *php
build: docker/php-7.4
php-8.0:
<<: *php
build: docker/php-8.0
Expand Down
26 changes: 0 additions & 26 deletions docker/php-7.2/Dockerfile

This file was deleted.

4 changes: 0 additions & 4 deletions docker/php-7.2/xdebug.ini

This file was deleted.

26 changes: 0 additions & 26 deletions docker/php-7.3/Dockerfile

This file was deleted.

4 changes: 0 additions & 4 deletions docker/php-7.3/xdebug.ini

This file was deleted.

0 comments on commit 13937aa

Please sign in to comment.