* rearrange service ordering
- pass https port
This commit is contained in:
@ -11,9 +11,6 @@ services:
|
|||||||
- ./log/nginx:/var/log/nginx
|
- ./log/nginx:/var/log/nginx
|
||||||
ports:
|
ports:
|
||||||
- "80:80"
|
- "80:80"
|
||||||
- "443:443"
|
|
||||||
expose:
|
|
||||||
- 80
|
|
||||||
php:
|
php:
|
||||||
build:
|
build:
|
||||||
context: ./dockerfiles/php-fpm
|
context: ./dockerfiles/php-fpm
|
||||||
@ -29,8 +26,6 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- ${PROJECTS_DIR}:/usr/share/nginx/html
|
- ${PROJECTS_DIR}:/usr/share/nginx/html
|
||||||
- ./data/profiler:/tmp/profiler
|
- ./data/profiler:/tmp/profiler
|
||||||
expose:
|
|
||||||
- 9000
|
|
||||||
workspace:
|
workspace:
|
||||||
build:
|
build:
|
||||||
context: ./dockerfiles/workspace
|
context: ./dockerfiles/workspace
|
||||||
@ -52,12 +47,6 @@ services:
|
|||||||
- user_ssh_key
|
- user_ssh_key
|
||||||
- user_known_hosts
|
- user_known_hosts
|
||||||
- composer_auth
|
- composer_auth
|
||||||
inbucket:
|
|
||||||
image: inbucket/inbucket
|
|
||||||
restart: always
|
|
||||||
ports:
|
|
||||||
- "2500:2500"
|
|
||||||
- "9090:9000"
|
|
||||||
db:
|
db:
|
||||||
image: mariadb
|
image: mariadb
|
||||||
restart: always
|
restart: always
|
||||||
@ -79,6 +68,12 @@ services:
|
|||||||
PMA_PASSWORD: 123456
|
PMA_PASSWORD: 123456
|
||||||
ports:
|
ports:
|
||||||
- "81:80"
|
- "81:80"
|
||||||
|
inbucket:
|
||||||
|
image: inbucket/inbucket
|
||||||
|
restart: always
|
||||||
|
ports:
|
||||||
|
- "2500:2500"
|
||||||
|
- "9090:9000"
|
||||||
redis:
|
redis:
|
||||||
image: redis
|
image: redis
|
||||||
restart: always
|
restart: always
|
||||||
|
@ -33,10 +33,6 @@ services:
|
|||||||
service: workspace
|
service: workspace
|
||||||
build:
|
build:
|
||||||
dockerfile: workspace81.Dockerfile
|
dockerfile: workspace81.Dockerfile
|
||||||
inbucket:
|
|
||||||
extends:
|
|
||||||
file: docker-compose.base.yml
|
|
||||||
service: inbucket
|
|
||||||
db:
|
db:
|
||||||
extends:
|
extends:
|
||||||
file: docker-compose.base.yml
|
file: docker-compose.base.yml
|
||||||
@ -45,6 +41,10 @@ services:
|
|||||||
extends:
|
extends:
|
||||||
file: docker-compose.base.yml
|
file: docker-compose.base.yml
|
||||||
service: pma
|
service: pma
|
||||||
|
inbucket:
|
||||||
|
extends:
|
||||||
|
file: docker-compose.base.yml
|
||||||
|
service: inbucket
|
||||||
redis:
|
redis:
|
||||||
extends:
|
extends:
|
||||||
file: docker-compose.base.yml
|
file: docker-compose.base.yml
|
||||||
|
Reference in New Issue
Block a user