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