antadis/devcontainer
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove links

Browse Source
This commit is contained in:
Michael RICOIS 2018-03-22 18:04:35 +01:00
parent a424826376
commit 87cdedf2f1
2 changed files with 20 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
compose/docker-compose.example.yml
View File

@ -1,4 +1,4 @@
version: '3' version: '2.3'
services: services:
# PHP 5.6 FPM # PHP 5.6 FPM
fpm56: fpm56:
@ -6,10 +6,7 @@ services:
image: php-fpm:5.6-debian image: php-fpm:5.6-debian
container_name: fpm56 container_name: fpm56
volumes: volumes:
- /home/antadis/workspace:/home/vhosts - ${WORKSPACE}:/home/vhosts
links:
- "db:db"
- "mailcatcher:mailcatcher"
logging: logging:
driver: "json-file" driver: "json-file"
options: options:
@ -21,10 +18,7 @@ services:
image: php-fpm:7.0-debian image: php-fpm:7.0-debian
container_name: fpm70 container_name: fpm70
volumes: volumes:
- /home/antadis/workspace:/home/vhosts - ${WORKSPACE}:/home/vhosts
links:
- "db:db"
- "mailcatcher:mailcatcher"
logging: logging:
driver: "json-file" driver: "json-file"
options: options:
@ -47,7 +41,7 @@ services:
container_name: db container_name: db
user: mysql user: mysql
volumes: volumes:
- /home/antadis/workspace/database:/var/lib/mysql - ${WORKSPACE}/database:/var/lib/mysql
logging: logging:
driver: "json-file" driver: "json-file"
options: options:
@ -61,10 +55,7 @@ services:
image: httpd:2.4-debian image: httpd:2.4-debian
container_name: httpd container_name: httpd
volumes: volumes:
- /home/antadis/workspace:/home/vhosts - ${WORKSPACE}:/home/vhosts
links:
- "fpm56:fpm56"
- "fpm70:fpm70"
logging: logging:
driver: "json-file" driver: "json-file"
options: options:

34
docker-compose.yml
View File

@ -1,14 +1,12 @@
version: '2.1' version: '2.3'
services: services:
# PHP 5.6 FPM # PHP 5.6 FPM
fpm56: fpm56:
container_name: fpm56 build: ./dockerfiles/php-fpm/5.6/debian-8
image: php-fpm:5.6-debian image: php-fpm:5.6-debian
container_name: fpm56
volumes: volumes:
- /home/michael/workspace:/home/vhosts - ${WORKSPACE}:/home/vhosts
links:
- "db:db"
- "mailcatcher:mailcatcher"
logging: logging:
driver: "json-file" driver: "json-file"
options: options:
@ -16,13 +14,11 @@ services:
max-file: "10" max-file: "10"
# PHP 7.0 FPM # PHP 7.0 FPM
fpm70: fpm70:
container_name: fpm70 build: ./dockerfiles/php-fpm/7.0/debian-9
image: php-fpm:7.0-debian image: php-fpm:7.0-debian
container_name: fpm70
volumes: volumes:
- /home/michael/workspace:/home/vhosts - ${WORKSPACE}:/home/vhosts
links:
- "db:db"
- "mailcatcher:mailcatcher"
logging: logging:
driver: "json-file" driver: "json-file"
options: options:
@ -30,8 +26,9 @@ services:
max-file: "10" max-file: "10"
# MailCatcher # MailCatcher
mailcatcher: mailcatcher:
container_name: mailcatcher build: ./dockerfiles/mailcatcher
image: mailcatcher:0.6.5 image: mailcatcher:0.6.5
container_name: mailcatcher
logging: logging:
driver: "json-file" driver: "json-file"
options: options:
@ -39,11 +36,12 @@ services:
max-file: "10" max-file: "10"
# MariaDB # MariaDB
db: db:
container_name: db build: ./dockerfiles/mariadb/10.2/debian
image: mariadb:10.2-debian image: mariadb:10.2-debian
container_name: db
user: mysql user: mysql
volumes: volumes:
- /home/michael/workspace/database:/var/lib/mysql - ${WORKSPACE}/database:/var/lib/mysql
logging: logging:
driver: "json-file" driver: "json-file"
options: options:
@ -53,13 +51,11 @@ services:
MARIADB_PASS: password MARIADB_PASS: password
# Apache HTTPd # Apache HTTPd
httpd: httpd:
container_name: httpd build: ./dockerfiles/httpd/2.4/debian-9
image: httpd:2.4-debian image: httpd:2.4-debian
container_name: httpd
volumes: volumes:
- /home/michael/workspace:/home/vhosts - ${WORKSPACE}:/home/vhosts
links:
- "fpm56:fpm56"
- "fpm70:fpm70"
logging: logging:
driver: "json-file" driver: "json-file"
options: options: