From 4b23424ff4851135ce92577966b7ddf53fdc8a5b Mon Sep 17 00:00:00 2001 From: Florestan Bredow Date: Tue, 27 Sep 2016 16:17:40 +0200 Subject: [PATCH] =?UTF-8?q?R=C3=A9organisation=20du=20d=C3=A9p=C3=B4t?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- {devphp7/config => config}/nginx.conf | 0 {devphp7/config => config}/php.ini | 0 {devphp7/config => config}/xdebug.ini | 0 devphp5/docker-compose.yml | 15 --------------- devphp7/docker-compose.yml => docker-compose.yml | 0 mapserver/docker-compose.yml | 6 ------ {devphp7/php-fpm => php-fpm}/Dockerfile | 0 {devphp7/smtp => smtp}/Dockerfile | 0 8 files changed, 21 deletions(-) rename {devphp7/config => config}/nginx.conf (100%) rename {devphp7/config => config}/php.ini (100%) rename {devphp7/config => config}/xdebug.ini (100%) delete mode 100644 devphp5/docker-compose.yml rename devphp7/docker-compose.yml => docker-compose.yml (100%) delete mode 100644 mapserver/docker-compose.yml rename {devphp7/php-fpm => php-fpm}/Dockerfile (100%) rename {devphp7/smtp => smtp}/Dockerfile (100%) diff --git a/devphp7/config/nginx.conf b/config/nginx.conf similarity index 100% rename from devphp7/config/nginx.conf rename to config/nginx.conf diff --git a/devphp7/config/php.ini b/config/php.ini similarity index 100% rename from devphp7/config/php.ini rename to config/php.ini diff --git a/devphp7/config/xdebug.ini b/config/xdebug.ini similarity index 100% rename from devphp7/config/xdebug.ini rename to config/xdebug.ini diff --git a/devphp5/docker-compose.yml b/devphp5/docker-compose.yml deleted file mode 100644 index a2b5078..0000000 --- a/devphp5/docker-compose.yml +++ /dev/null @@ -1,15 +0,0 @@ -devphp: - image: daiko/php - ports: - - "80:80" - volumes: - - ~/Public:/var/www - links: - - mariadb - -mariadb: - image: daiko/mariadb - ports: - - "3306:3306" - volumes: - - ~/.mysql:/var/lib/mysql diff --git a/devphp7/docker-compose.yml b/docker-compose.yml similarity index 100% rename from devphp7/docker-compose.yml rename to docker-compose.yml diff --git a/mapserver/docker-compose.yml b/mapserver/docker-compose.yml deleted file mode 100644 index b9bb92a..0000000 --- a/mapserver/docker-compose.yml +++ /dev/null @@ -1,6 +0,0 @@ -devphp: - image: daiko/mapserver-ecw - ports: - - "80:80" - volumes: - - ~/VirtualBox\ VMs/cartesSIG:/var/www/html diff --git a/devphp7/php-fpm/Dockerfile b/php-fpm/Dockerfile similarity index 100% rename from devphp7/php-fpm/Dockerfile rename to php-fpm/Dockerfile diff --git a/devphp7/smtp/Dockerfile b/smtp/Dockerfile similarity index 100% rename from devphp7/smtp/Dockerfile rename to smtp/Dockerfile