Browse Source

* rename php-fpm dockerfile to simple naming

* update docker-compose example with modified dockerfile name in php-fpm versions services
master
Alexander Demidov 4 years ago
parent
commit
9f0f96a499
  1. 11
      docker-compose.yml.example
  2. 0
      dockerfiles/php-fpm/php.base.Dockerfile
  3. 2
      dockerfiles/php-fpm/php73.Dockerfile
  4. 2
      dockerfiles/php-fpm/php74.Dockerfile

11
docker-compose.yml.example

@ -6,19 +6,19 @@ services:
file: docker-compose.base.yml file: docker-compose.base.yml
service: nginx service: nginx
php-fpm73:
php73:
extends: extends:
file: docker-compose.base.yml file: docker-compose.base.yml
service: php-fpm service: php-fpm
build: build:
context: ./dockerfiles/php-fpm73
dockerfile: php73.Dockerfile
php-fpm74:
php74:
extends: extends:
file: docker-compose.base.yml file: docker-compose.base.yml
service: php-fpm service: php-fpm
build: build:
context: ./dockerfiles/php-fpm74
dockerfile: php74.Dockerfile
workspace73: workspace73:
extends: extends:
@ -59,3 +59,6 @@ services:
extends: extends:
file: docker-compose.base.yml file: docker-compose.base.yml
service: redis service: redis
volumes:
database:

0
dockerfiles/php-fpm/php-fpm.base.Dockerfile → dockerfiles/php-fpm/php.base.Dockerfile

2
dockerfiles/php-fpm/php-fpm73.Dockerfile → dockerfiles/php-fpm/php73.Dockerfile

@ -1,4 +1,4 @@
# syntax = edrevo/dockerfile-plus # syntax = edrevo/dockerfile-plus
FROM php:7.3-fpm FROM php:7.3-fpm
INCLUDE+ ./php-fpm.base.Dockerfile
INCLUDE+ ./php.base.Dockerfile

2
dockerfiles/php-fpm/php-fpm74.Dockerfile → dockerfiles/php-fpm/php74.Dockerfile

@ -1,4 +1,4 @@
# syntax = edrevo/dockerfile-plus # syntax = edrevo/dockerfile-plus
FROM php:7.4-fpm FROM php:7.4-fpm
INCLUDE+ ./php-fpm.base.Dockerfile
INCLUDE+ ./php.base.Dockerfile
Loading…
Cancel
Save