From 3ed355a51591aeb4a3e9b933c2a5e3e678dc0c9a Mon Sep 17 00:00:00 2001 From: daiko Date: Mon, 5 Nov 2018 14:17:23 +0100 Subject: [PATCH] Utilise des submodules plutot que des images issues de docker hub. --- .gitmodules | 6 ++++++ docker-compose.yml | 8 ++++---- mailcatcher | 1 + phpfpm-dev | 1 + 4 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 .gitmodules create mode 160000 mailcatcher create mode 160000 phpfpm-dev diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..14adc48 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "docker-mailcatcher"] + path = mailcatcher + url = git@github.com:daiko/docker-mailcatcher.git +[submodule "docker-phpfpm-dev"] + path = phpfpm-dev + url = git@github.com:daiko/docker-phpfpm-dev.git diff --git a/docker-compose.yml b/docker-compose.yml index 95e2287..da5d559 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,18 +9,18 @@ mariadb: - MYSQL_ROOT_PASSWORD=MyPassWord48 mailcatcher: - image: daiko/mailcatcher:latest + build: mailcatcher expose: - 25 ports: - 1080:1080 php: - image: daiko/phpfpm-dev:latest + build: phpfpm-dev expose: - 9000 volumes: - - ~/Public:/var/www/html + - ~/public:/var/www/html - ~/log/xdebug:/var/log/xdebug - ~/log/php:/var/log/php - ./config/xdebug.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini @@ -33,7 +33,7 @@ php: nginx: image: nginx:latest volumes: - - ~/Public:/var/www/html + - ~/public:/var/www/html - ~/log/nginx:/var/log/nginx - ./config/nginx.conf:/etc/nginx/nginx.conf ports: diff --git a/mailcatcher b/mailcatcher new file mode 160000 index 0000000..36bc40b --- /dev/null +++ b/mailcatcher @@ -0,0 +1 @@ +Subproject commit 36bc40b8f930f4c9a6528a290cbf12440984c05b diff --git a/phpfpm-dev b/phpfpm-dev new file mode 160000 index 0000000..2976043 --- /dev/null +++ b/phpfpm-dev @@ -0,0 +1 @@ +Subproject commit 29760435f2347be13c4426d131a40f83acf1c87d