From f6ac5fc77603d7f1cd5d125d3b10625cd92bbc43 Mon Sep 17 00:00:00 2001 From: cytopia Date: Sun, 25 Mar 2018 12:29:27 +0200 Subject: [PATCH] Cleanup --- .gitignore | 4 ++-- README.md | 9 ++++++-- cfg/hhvm-latest/.keepme | 0 cfg/hhvm-latest/devilbox-custom.ini-example | 24 --------------------- docs/tutorials/enable-auto-dns.rst | 2 +- mod/hhvm-latest/.keepme | 0 6 files changed, 10 insertions(+), 29 deletions(-) delete mode 100644 cfg/hhvm-latest/.keepme delete mode 100644 cfg/hhvm-latest/devilbox-custom.ini-example delete mode 100644 mod/hhvm-latest/.keepme diff --git a/.gitignore b/.gitignore index 8e299c98..29096d56 100644 --- a/.gitignore +++ b/.gitignore @@ -45,7 +45,7 @@ /cfg/php-fpm-7.0/*.ini /cfg/php-fpm-7.1/*.ini /cfg/php-fpm-7.2/*.ini -/cfg/hhvm-latest/*.ini +#/cfg/hhvm-latest/*.ini # Ignore custom PHP-FPM modules /mod/php-fpm-5.4/*.so @@ -54,7 +54,7 @@ /mod/php-fpm-7.0/*.so /mod/php-fpm-7.1/*.so /mod/php-fpm-7.2/*.so -/mod/hhvm-latest/*.so +#/mod/hhvm-latest/*.so # Ignore custom bash and other confi files /bash/* diff --git a/README.md b/README.md index c17f6661..60f75721 100644 --- a/README.md +++ b/README.md @@ -19,8 +19,13 @@ The devilbox is a modern and highly customisable **dockerized PHP stack** supporting full **LAMP** and **MEAN** and running on all major platforms. The main goal is to easily switch and combine any version required for local development. It supports an unlimited number of projects for which vhosts and DNS records are created automatically. Email catch-all and popular development tools will be at your service as well. Configuration is not necessary, as everything is pre-setup with mass virtual hosting. +**Requirements** + ![Linux](https://raw.githubusercontent.com/cytopia/icons/master/64x64/linux.png) ![Windows](https://raw.githubusercontent.com/cytopia/icons/master/64x64/windows.png) ![OSX](https://raw.githubusercontent.com/cytopia/icons/master/64x64/osx.png) +* [Docker Engine 1.12.0+](https://docs.docker.com/compose/compose-file/compose-versioning/#version-21) +* [Docker Compose 1.9.0+](https://docs.docker.com/compose/compose-file/compose-versioning/#version-21) + ## Community @@ -264,7 +269,7 @@ The devilbox has everything setup for you. The only thing you will have to insta :star: Xdebug - Xdebug and a full blown PHP-FPM/HHVM server is ready to serve. + Xdebug and a full blown PHP-FPM server is ready to serve. :star: Many more @@ -346,7 +351,7 @@ The devilbox is a development stack, so it is made sure that a lot of PHP module #### Custom PHP Modules -You can also copy any custom modules into `mod/(php-fpm|hhvm)-` and add a custom `*.ini` file to load them. +You can also copy any custom modules into `mod/(php-fpm)-` and add a custom `*.ini` file to load them. #### Supported Frameworks diff --git a/cfg/hhvm-latest/.keepme b/cfg/hhvm-latest/.keepme deleted file mode 100644 index e69de29b..00000000 diff --git a/cfg/hhvm-latest/devilbox-custom.ini-example b/cfg/hhvm-latest/devilbox-custom.ini-example deleted file mode 100644 index 8abc7df5..00000000 --- a/cfg/hhvm-latest/devilbox-custom.ini-example +++ /dev/null @@ -1,24 +0,0 @@ -; Use PHP 5.6 or PHP 7 mode for HHVM -; PHP 5.6 Mode -hhvm.php7.all = 0 -; PHP 7 Mode (default) -;hhvm.php7.all = 1 - -[PHP] -; Memory -memory_limit = 4096M - -; Timeouts -max_execution_time = 180 -max_input_time = 180 -; Uploads -post_max_size = 1990M -upload_max_filesize = 1990M - -; Vars -max_input_vars = 8000 - -; Error reporting -error_reporting = E_ALL -display_errors = On -track_errors = On diff --git a/docs/tutorials/enable-auto-dns.rst b/docs/tutorials/enable-auto-dns.rst index d4da6148..8cedfe25 100644 --- a/docs/tutorials/enable-auto-dns.rst +++ b/docs/tutorials/enable-auto-dns.rst @@ -4,4 +4,4 @@ Enable Auto-DNS *************** -asdasd +Todo diff --git a/mod/hhvm-latest/.keepme b/mod/hhvm-latest/.keepme deleted file mode 100644 index e69de29b..00000000