Przeglądaj źródła

PHP/* Remove TE base dependencies (#3535)

* [ci lang-only PHP]

* [ci lang-only PHP]

* [ci lang-only PHP] remove phalcon-micro dup install and fix permissions

* for real this time [ci lang-only PHP]
Nate 7 lat temu
rodzic
commit
cc61ef5d58
84 zmienionych plików z 858 dodań i 229 usunięć
  1. 16 1
      frameworks/PHP/cakephp/cakephp.dockerfile
  2. 2 2
      frameworks/PHP/cakephp/deploy/nginx.conf
  3. 16 1
      frameworks/PHP/clancats/clancats.dockerfile
  4. 2 2
      frameworks/PHP/clancats/deploy/nginx.conf
  5. 18 1
      frameworks/PHP/codeigniter/codeigniter-hhvm.dockerfile
  6. 16 1
      frameworks/PHP/codeigniter/codeigniter.dockerfile
  7. 2 2
      frameworks/PHP/codeigniter/deploy/nginx-fpm.conf
  8. 2 2
      frameworks/PHP/codeigniter/deploy/nginx-hhvm.conf
  9. 0 6
      frameworks/PHP/cygnite/cygnite-base.dockerfile
  10. 21 1
      frameworks/PHP/cygnite/cygnite-raw.dockerfile
  11. 21 1
      frameworks/PHP/cygnite/cygnite.dockerfile
  12. 2 2
      frameworks/PHP/cygnite/deploy/nginx.conf
  13. 2 2
      frameworks/PHP/fat-free/deploy/nginx.conf
  14. 0 11
      frameworks/PHP/fat-free/fat-free-base.dockerfile
  15. 26 1
      frameworks/PHP/fat-free/fat-free-raw.dockerfile
  16. 26 1
      frameworks/PHP/fat-free/fat-free.dockerfile
  17. 2 2
      frameworks/PHP/fuel/deploy/nginx.conf
  18. 16 1
      frameworks/PHP/fuel/fuel.dockerfile
  19. 2 2
      frameworks/PHP/hhvm/deploy/nginx.conf
  20. 18 1
      frameworks/PHP/hhvm/hhvm.dockerfile
  21. 2 2
      frameworks/PHP/kohana/deploy/nginx.conf
  22. 16 1
      frameworks/PHP/kohana/kohana.dockerfile
  23. 2 2
      frameworks/PHP/kumbiaphp/deploy/nginx.conf
  24. 0 7
      frameworks/PHP/kumbiaphp/kumbiaphp-base.dockerfile
  25. 22 1
      frameworks/PHP/kumbiaphp/kumbiaphp-raw.dockerfile
  26. 22 1
      frameworks/PHP/kumbiaphp/kumbiaphp.dockerfile
  27. 0 4
      frameworks/PHP/laravel/.env
  28. 2 2
      frameworks/PHP/laravel/deploy/nginx.conf
  29. 23 1
      frameworks/PHP/laravel/laravel.dockerfile
  30. 2 2
      frameworks/PHP/limonade/deploy/nginx.conf
  31. 16 1
      frameworks/PHP/limonade/limonade.dockerfile
  32. 2 2
      frameworks/PHP/lithium/deploy/nginx.conf
  33. 16 1
      frameworks/PHP/lithium/lithium.dockerfile
  34. 2 2
      frameworks/PHP/lumen/deploy/nginx.conf
  35. 21 1
      frameworks/PHP/lumen/lumen.dockerfile
  36. 1 7
      frameworks/PHP/peachpie/peachpie.dockerfile
  37. 0 1
      frameworks/PHP/phalcon/app/controllers/BenchController.php
  38. 2 2
      frameworks/PHP/phalcon/deploy/nginx.conf
  39. 0 10
      frameworks/PHP/phalcon/phalcon-base.dockerfile
  40. 16 7
      frameworks/PHP/phalcon/phalcon-micro.dockerfile
  41. 25 1
      frameworks/PHP/phalcon/phalcon-mongodb.dockerfile
  42. 25 1
      frameworks/PHP/phalcon/phalcon.dockerfile
  43. 18 0
      frameworks/PHP/php/benchmark_config.json
  44. 2 2
      frameworks/PHP/php/deploy/nginx5.conf
  45. 2 2
      frameworks/PHP/php/deploy/nginx7.conf
  46. 23 1
      frameworks/PHP/php/php-php5-raw.dockerfile
  47. 23 1
      frameworks/PHP/php/php-php5.dockerfile
  48. 23 1
      frameworks/PHP/php/php-raw7.dockerfile
  49. 14 0
      frameworks/PHP/php/php-swoole.dockerfile
  50. 23 1
      frameworks/PHP/php/php.dockerfile
  51. 0 8
      frameworks/PHP/php/php5-base.dockerfile
  52. 0 8
      frameworks/PHP/php/php7-base.dockerfile
  53. 10 0
      frameworks/PHP/php/swoole-server.php
  54. 2 2
      frameworks/PHP/phpixie/deploy/nginx.conf
  55. 16 1
      frameworks/PHP/phpixie/phpixie.dockerfile
  56. 2 2
      frameworks/PHP/phreeze/deploy/nginx.conf
  57. 16 1
      frameworks/PHP/phreeze/phreeze.dockerfile
  58. 2 2
      frameworks/PHP/silex/deploy/nginx.conf
  59. 0 6
      frameworks/PHP/silex/silex-base.dockerfile
  60. 21 1
      frameworks/PHP/silex/silex-raw.dockerfile
  61. 21 1
      frameworks/PHP/silex/silex.dockerfile
  62. 2 2
      frameworks/PHP/slim/deploy/nginx-fpm-5.conf
  63. 2 2
      frameworks/PHP/slim/deploy/nginx-fpm-7.conf
  64. 2 2
      frameworks/PHP/slim/deploy/nginx-hhvm.conf
  65. 18 1
      frameworks/PHP/slim/slim-hhvm.dockerfile
  66. 16 1
      frameworks/PHP/slim/slim-php5.dockerfile
  67. 16 1
      frameworks/PHP/slim/slim.dockerfile
  68. 2 2
      frameworks/PHP/symfony/deploy/nginx.conf
  69. 0 17
      frameworks/PHP/symfony/symfony-base.dockerfile
  70. 32 1
      frameworks/PHP/symfony/symfony-raw.dockerfile
  71. 32 1
      frameworks/PHP/symfony/symfony.dockerfile
  72. 16 1
      frameworks/PHP/workerman/workerman.dockerfile
  73. 2 2
      frameworks/PHP/yii2/deploy/nginx-fpm.conf
  74. 2 2
      frameworks/PHP/yii2/deploy/nginx-hhvm.conf
  75. 19 1
      frameworks/PHP/yii2/yii2-hhvm.dockerfile
  76. 16 1
      frameworks/PHP/yii2/yii2.dockerfile
  77. 2 2
      frameworks/PHP/zend/deploy/nginx.conf
  78. 16 1
      frameworks/PHP/zend/zend.dockerfile
  79. 2 2
      frameworks/PHP/zend1/deploy/nginx.conf
  80. 16 1
      frameworks/PHP/zend1/zend1.dockerfile
  81. 0 7
      toolset/setup/docker/languages/hhvm-php5.dockerfile
  82. 0 7
      toolset/setup/docker/languages/hhvm-php7.dockerfile
  83. 0 15
      toolset/setup/docker/languages/php5.dockerfile
  84. 0 15
      toolset/setup/docker/languages/php7.dockerfile

+ 16 - 1
frameworks/PHP/cakephp/cakephp.dockerfile

@@ -1,4 +1,19 @@
-FROM techempower/php5:0.1
+FROM ubuntu:16.04
+
+RUN apt update -yqq && apt install -yqq software-properties-common
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
+RUN apt-get update -yqq
+RUN apt-get install -yqq nginx git unzip php5.6 php5.6-common php5.6-cli php5.6-fpm php5.6-mysql php5.6-xml php5.6-mbstring php5.6-mcrypt
+
+RUN mkdir /composer
+WORKDIR /composer
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+RUN php composer-setup.php
+RUN php -r "unlink('composer-setup.php');"
+
+ENV PATH /composer:${PATH}
 
 ADD ./ /cakephp
 WORKDIR /cakephp

+ 2 - 2
frameworks/PHP/cakephp/deploy/nginx.conf

@@ -8,7 +8,7 @@ events {
 }
 
 http {
-    include       /nginx/conf/mime.types;
+    include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
     access_log off;
     server_tokens off;
@@ -57,7 +57,7 @@ http {
             fastcgi_keep_conn on;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-            include        /nginx/conf/fastcgi_params;
+            include        /etc/nginx/fastcgi_params;
         }
     }
 }

+ 16 - 1
frameworks/PHP/clancats/clancats.dockerfile

@@ -1,4 +1,19 @@
-FROM techempower/php5:0.1
+FROM ubuntu:16.04
+
+RUN apt update -yqq && apt install -yqq software-properties-common
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
+RUN apt-get update -yqq
+RUN apt-get install -yqq nginx git unzip php5.6 php5.6-common php5.6-cli php5.6-fpm php5.6-mysql php5.6-xml php5.6-mbstring php5.6-mcrypt
+
+RUN mkdir /composer
+WORKDIR /composer
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+RUN php composer-setup.php
+RUN php -r "unlink('composer-setup.php');"
+
+ENV PATH /composer:${PATH}
 
 ADD ./ /clancats
 WORKDIR /clancats

+ 2 - 2
frameworks/PHP/clancats/deploy/nginx.conf

@@ -7,7 +7,7 @@ events {
 }
 
 http {
-	include       /nginx/conf/mime.types;
+	include       /etc/nginx/mime.types;
 	default_type  application/octet-stream;
 
 	access_log off;
@@ -38,7 +38,7 @@ http {
 			fastcgi_keep_conn on;
 			fastcgi_index  index.php;
 			fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-			include        /nginx/conf/fastcgi_params;
+			include        /etc/nginx/fastcgi_params;
 		}
 	}
 }

+ 18 - 1
frameworks/PHP/codeigniter/codeigniter-hhvm.dockerfile

@@ -1,4 +1,21 @@
-FROM techempower/hhvm-php7:0.1
+FROM ubuntu:16.04
+
+RUN apt update -yqq && apt install -yqq software-properties-common apt-transport-https
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
+RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xB4112585D386EB94
+RUN add-apt-repository https://dl.hhvm.com/ubuntu
+RUN apt-get update -yqq
+RUN apt install -yqq hhvm nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql php7.2-xml php7.2-mbstring php7.2-mongodb
+
+RUN mkdir /composer
+WORKDIR /composer
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+RUN php composer-setup.php
+RUN php -r "unlink('composer-setup.php');"
+
+ENV PATH /composer:${PATH}
 
 ADD ./ /codeigniter
 WORKDIR /codeigniter

+ 16 - 1
frameworks/PHP/codeigniter/codeigniter.dockerfile

@@ -1,4 +1,19 @@
-FROM techempower/php7:0.1
+FROM ubuntu:16.04
+
+RUN apt update -yqq && apt install -yqq software-properties-common
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
+RUN apt-get update -yqq
+RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql php7.2-xml php7.2-mbstring php7.2-mongodb
+
+RUN mkdir /composer
+WORKDIR /composer
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+RUN php composer-setup.php
+RUN php -r "unlink('composer-setup.php');"
+
+ENV PATH /composer:${PATH}
 
 ADD ./ /codeigniter
 WORKDIR /codeigniter

+ 2 - 2
frameworks/PHP/codeigniter/deploy/nginx-fpm.conf

@@ -7,7 +7,7 @@ events {
 }
 
 http {
-  include /nginx/conf/mime.types;
+  include /etc/nginx/mime.types;
   default_type application/octet-stream;
   access_log off;
   server_tokens off;
@@ -36,7 +36,7 @@ http {
       fastcgi_keep_conn on;
       fastcgi_index index.php;
       fastcgi_param SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-      include /nginx/conf/fastcgi_params;
+      include /etc/nginx/fastcgi_params;
     }
   }
 }

+ 2 - 2
frameworks/PHP/codeigniter/deploy/nginx-hhvm.conf

@@ -7,7 +7,7 @@ events {
 }
 
 http {
-  include /nginx/conf/mime.types;
+  include /etc/nginx/mime.types;
   default_type application/octet-stream;
   access_log off;
   server_tokens off;
@@ -36,7 +36,7 @@ http {
       fastcgi_keep_conn on;
       fastcgi_index index.php;
       fastcgi_param SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-      include /nginx/conf/fastcgi_params;
+      include /etc/nginx/fastcgi_params;
     }
   }
 }

+ 0 - 6
frameworks/PHP/cygnite/cygnite-base.dockerfile

@@ -1,6 +0,0 @@
-FROM techempower/php5:0.1
-
-ADD ./ /cygnite
-WORKDIR /cygnite
-
-RUN composer.phar install --no-progress

+ 21 - 1
frameworks/PHP/cygnite/cygnite-raw.dockerfile

@@ -1,4 +1,24 @@
-FROM techempower/cygnite-base:0.1
+FROM ubuntu:16.04
+
+RUN apt update -yqq && apt install -yqq software-properties-common
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
+RUN apt-get update -yqq
+RUN apt-get install -yqq nginx git unzip php5.6 php5.6-common php5.6-cli php5.6-fpm php5.6-mysql php5.6-xml php5.6-mbstring php5.6-mcrypt
+
+RUN mkdir /composer
+WORKDIR /composer
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+RUN php composer-setup.php
+RUN php -r "unlink('composer-setup.php');"
+
+ENV PATH /composer:${PATH}
+
+ADD ./ /cygnite
+WORKDIR /cygnite
+
+RUN composer.phar install --no-progress
 
 CMD service php5.6-fpm start && \
     nginx -c /cygnite/deploy/nginx.conf -g "daemon off;"

+ 21 - 1
frameworks/PHP/cygnite/cygnite.dockerfile

@@ -1,4 +1,24 @@
-FROM techempower/cygnite-base:0.1
+FROM ubuntu:16.04
+
+RUN apt update -yqq && apt install -yqq software-properties-common
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
+RUN apt-get update -yqq
+RUN apt-get install -yqq nginx git unzip php5.6 php5.6-common php5.6-cli php5.6-fpm php5.6-mysql php5.6-xml php5.6-mbstring php5.6-mcrypt
+
+RUN mkdir /composer
+WORKDIR /composer
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+RUN php composer-setup.php
+RUN php -r "unlink('composer-setup.php');"
+
+ENV PATH /composer:${PATH}
+
+ADD ./ /cygnite
+WORKDIR /cygnite
+
+RUN composer.phar install --no-progress
 
 CMD service php5.6-fpm start && \
     nginx -c /cygnite/deploy/nginx.conf -g "daemon off;"

+ 2 - 2
frameworks/PHP/cygnite/deploy/nginx.conf

@@ -8,7 +8,7 @@ events {
 }
 
 http {
-    include       /nginx/conf/mime.types;
+    include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
     access_log off;
     server_tokens off;
@@ -57,7 +57,7 @@ http {
             fastcgi_keep_conn on;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-            include        /nginx/conf/fastcgi_params;
+            include        /etc/nginx/fastcgi_params;
         }
     }
 }

+ 2 - 2
frameworks/PHP/fat-free/deploy/nginx.conf

@@ -8,7 +8,7 @@ events {
 }
 
 http {
-    include       /nginx/conf/mime.types;
+    include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
     access_log off;
     server_tokens off;
@@ -57,7 +57,7 @@ http {
             fastcgi_keep_conn on;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-            include        /nginx/conf/fastcgi_params;
+            include        /etc/nginx/fastcgi_params;
         }
     }
 }

+ 0 - 11
frameworks/PHP/fat-free/fat-free-base.dockerfile

@@ -1,11 +0,0 @@
-FROM techempower/php7:0.1
-
-ADD ./ /fat-free
-WORKDIR /fat-free
-
-ENV F3DIR="/fat-free/src"
-
-RUN git clone "https://github.com/bcosca/fatfree-core.git" src
-RUN cd src && git checkout -q "069ccd84afd2461c7ebb67f660c142f97577e661" # v3.5.2-dev
-
-RUN chmod -R 777 /fat-free

+ 26 - 1
frameworks/PHP/fat-free/fat-free-raw.dockerfile

@@ -1,4 +1,29 @@
-FROM techempower/fat-free-base:0.1
+FROM ubuntu:16.04
+
+RUN apt update -yqq && apt install -yqq software-properties-common
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
+RUN apt-get update -yqq
+RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql php7.2-xml php7.2-mbstring php7.2-mongodb
+
+RUN mkdir /composer
+WORKDIR /composer
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+RUN php composer-setup.php
+RUN php -r "unlink('composer-setup.php');"
+
+ENV PATH /composer:${PATH}
+
+ADD ./ /fat-free
+WORKDIR /fat-free
+
+ENV F3DIR="/fat-free/src"
+
+RUN git clone "https://github.com/bcosca/fatfree-core.git" src
+RUN cd src && git checkout -q "069ccd84afd2461c7ebb67f660c142f97577e661" # v3.5.2-dev
+
+RUN chmod -R 777 /fat-free
 
 CMD service php7.2-fpm start && \
     nginx -c /fat-free/deploy/nginx.conf -g "daemon off;"

+ 26 - 1
frameworks/PHP/fat-free/fat-free.dockerfile

@@ -1,4 +1,29 @@
-FROM techempower/fat-free-base:0.1
+FROM ubuntu:16.04
+
+RUN apt update -yqq && apt install -yqq software-properties-common
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
+RUN apt-get update -yqq
+RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql php7.2-xml php7.2-mbstring php7.2-mongodb
+
+RUN mkdir /composer
+WORKDIR /composer
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+RUN php composer-setup.php
+RUN php -r "unlink('composer-setup.php');"
+
+ENV PATH /composer:${PATH}
+
+ADD ./ /fat-free
+WORKDIR /fat-free
+
+ENV F3DIR="/fat-free/src"
+
+RUN git clone "https://github.com/bcosca/fatfree-core.git" src
+RUN cd src && git checkout -q "069ccd84afd2461c7ebb67f660c142f97577e661" # v3.5.2-dev
+
+RUN chmod -R 777 /fat-free
 
 CMD service php7.2-fpm start && \
     nginx -c /fat-free/deploy/nginx.conf -g "daemon off;"

+ 2 - 2
frameworks/PHP/fuel/deploy/nginx.conf

@@ -8,7 +8,7 @@ events {
 }
 
 http {
-    include       /nginx/conf/mime.types;
+    include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
     access_log off;
     server_tokens off;
@@ -57,7 +57,7 @@ http {
             fastcgi_keep_conn on;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-            include        /nginx/conf/fastcgi_params;
+            include        /etc/nginx/fastcgi_params;
         }
     }
 }

+ 16 - 1
frameworks/PHP/fuel/fuel.dockerfile

@@ -1,4 +1,19 @@
-FROM techempower/php5:0.1
+FROM ubuntu:16.04
+
+RUN apt update -yqq && apt install -yqq software-properties-common
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
+RUN apt-get update -yqq
+RUN apt-get install -yqq nginx git unzip php5.6 php5.6-common php5.6-cli php5.6-fpm php5.6-mysql php5.6-xml php5.6-mbstring php5.6-mcrypt
+
+RUN mkdir /composer
+WORKDIR /composer
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+RUN php composer-setup.php
+RUN php -r "unlink('composer-setup.php');"
+
+ENV PATH /composer:${PATH}
 
 ADD ./ /fuel
 WORKDIR /fuel

+ 2 - 2
frameworks/PHP/hhvm/deploy/nginx.conf

@@ -7,7 +7,7 @@ events {
 }
 
 http {
-    include       /nginx/conf/mime.types;
+    include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
     access_log off;
     server_tokens off;
@@ -29,7 +29,7 @@ http {
             fastcgi_pass   fastcgi_backend;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME $document_root$fastcgi_script_name;
-            include        /nginx/conf/fastcgi_params;
+            include        /etc/nginx/fastcgi_params;
         }
     }
 }

+ 18 - 1
frameworks/PHP/hhvm/hhvm.dockerfile

@@ -1,4 +1,21 @@
-FROM techempower/hhvm-php7:0.1
+FROM ubuntu:16.04
+
+RUN apt update -yqq && apt install -yqq software-properties-common apt-transport-https
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
+RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xB4112585D386EB94
+RUN add-apt-repository https://dl.hhvm.com/ubuntu
+RUN apt-get update -yqq
+RUN apt install -yqq hhvm nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql php7.2-xml php7.2-mbstring php7.2-mongodb
+
+RUN mkdir /composer
+WORKDIR /composer
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+RUN php composer-setup.php
+RUN php -r "unlink('composer-setup.php');"
+
+ENV PATH /composer:${PATH}
 
 ADD ./ /hhvm_app
 WORKDIR /hhvm_app

+ 2 - 2
frameworks/PHP/kohana/deploy/nginx.conf

@@ -8,7 +8,7 @@ events {
 }
 
 http {
-    include       /nginx/conf/mime.types;
+    include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
     access_log off;
     server_tokens off;
@@ -57,7 +57,7 @@ http {
             fastcgi_keep_conn on;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-            include        /nginx/conf/fastcgi_params;
+            include        /etc/nginx/fastcgi_params;
         }
     }
 }

+ 16 - 1
frameworks/PHP/kohana/kohana.dockerfile

@@ -1,4 +1,19 @@
-FROM techempower/php7:0.1
+FROM ubuntu:16.04
+
+RUN apt update -yqq && apt install -yqq software-properties-common
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
+RUN apt-get update -yqq
+RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql php7.2-xml php7.2-mbstring php7.2-mongodb
+
+RUN mkdir /composer
+WORKDIR /composer
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+RUN php composer-setup.php
+RUN php -r "unlink('composer-setup.php');"
+
+ENV PATH /composer:${PATH}
 
 ADD ./ /kohana
 WORKDIR /kohana

+ 2 - 2
frameworks/PHP/kumbiaphp/deploy/nginx.conf

@@ -8,7 +8,7 @@ events {
 }
 
 http {
-    include       /nginx/conf/mime.types;
+    include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
     access_log off;
     server_tokens off;
@@ -57,7 +57,7 @@ http {
             fastcgi_keep_conn on;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-            include        /nginx/conf/fastcgi_params;
+            include        /etc/nginx/fastcgi_params;
         }
     }
 }

+ 0 - 7
frameworks/PHP/kumbiaphp/kumbiaphp-base.dockerfile

@@ -1,7 +0,0 @@
-FROM techempower/php7:0.1
-
-ADD ./ /kumbiaphp
-WORKDIR /kumbiaphp
-
-RUN git clone -b v1.0.0-rc.2 --single-branch --depth 1 https://github.com/KumbiaPHP/KumbiaPHP.git vendor/Kumbia
-RUN git clone -b v0.4.0 --single-branch --depth 1 https://github.com/KumbiaPHP/ActiveRecord.git vendor/Kumbia/ActiveRecord

+ 22 - 1
frameworks/PHP/kumbiaphp/kumbiaphp-raw.dockerfile

@@ -1,4 +1,25 @@
-FROM techempower/kumbiaphp-base:0.1
+FROM ubuntu:16.04
+
+RUN apt update -yqq && apt install -yqq software-properties-common
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
+RUN apt-get update -yqq
+RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql php7.2-xml php7.2-mbstring php7.2-mongodb
+
+RUN mkdir /composer
+WORKDIR /composer
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+RUN php composer-setup.php
+RUN php -r "unlink('composer-setup.php');"
+
+ENV PATH /composer:${PATH}
+
+ADD ./ /kumbiaphp
+WORKDIR /kumbiaphp
+
+RUN git clone -b v1.0.0-rc.2 --single-branch --depth 1 https://github.com/KumbiaPHP/KumbiaPHP.git vendor/Kumbia
+RUN git clone -b v0.4.0 --single-branch --depth 1 https://github.com/KumbiaPHP/ActiveRecord.git vendor/Kumbia/ActiveRecord
 
 CMD service php7.2-fpm start && \
     nginx -c /kumbiaphp/deploy/nginx.conf -g "daemon off;"

+ 22 - 1
frameworks/PHP/kumbiaphp/kumbiaphp.dockerfile

@@ -1,4 +1,25 @@
-FROM techempower/kumbiaphp-base:0.1
+FROM ubuntu:16.04
+
+RUN apt update -yqq && apt install -yqq software-properties-common
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
+RUN apt-get update -yqq
+RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql php7.2-xml php7.2-mbstring php7.2-mongodb
+
+RUN mkdir /composer
+WORKDIR /composer
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+RUN php composer-setup.php
+RUN php -r "unlink('composer-setup.php');"
+
+ENV PATH /composer:${PATH}
+
+ADD ./ /kumbiaphp
+WORKDIR /kumbiaphp
+
+RUN git clone -b v1.0.0-rc.2 --single-branch --depth 1 https://github.com/KumbiaPHP/KumbiaPHP.git vendor/Kumbia
+RUN git clone -b v0.4.0 --single-branch --depth 1 https://github.com/KumbiaPHP/ActiveRecord.git vendor/Kumbia/ActiveRecord
 
 CMD service php7.2-fpm start && \
     nginx -c /kumbiaphp/deploy/nginx.conf -g "daemon off;"

+ 0 - 4
frameworks/PHP/laravel/.env

@@ -19,10 +19,6 @@ SESSION_DRIVER=array
 SESSION_LIFETIME=120
 QUEUE_DRIVER=sync
 
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
-REDIS_PORT=6379
-
 MAIL_DRIVER=smtp
 MAIL_HOST=smtp.mailtrap.io
 MAIL_PORT=2525

+ 2 - 2
frameworks/PHP/laravel/deploy/nginx.conf

@@ -8,7 +8,7 @@ events {
 }
 
 http {
-    include       /nginx/conf/mime.types;
+    include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
     access_log off;
     server_tokens off;
@@ -57,7 +57,7 @@ http {
             fastcgi_keep_conn on;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-            include        /nginx/conf/fastcgi_params;
+            include        /etc/nginx/fastcgi_params;
         }
     }
 }

+ 23 - 1
frameworks/PHP/laravel/laravel.dockerfile

@@ -1,8 +1,30 @@
-FROM techempower/php7:0.1
+FROM ubuntu:16.04
+
+RUN apt update -yqq && apt install -yqq software-properties-common
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
+RUN apt-get update -yqq
+RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql php7.2-xml php7.2-mbstring php7.2-mongodb
+
+RUN mkdir /composer
+WORKDIR /composer
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+RUN php composer-setup.php
+RUN php -r "unlink('composer-setup.php');"
+
+ENV PATH /composer:${PATH}
 
 ADD ./ /laravel
 WORKDIR /laravel
 
+RUN mkdir -p /laravel/bootstrap/cache
+RUN mkdir -p /laravel/storage/framework/sessions
+RUN mkdir -p /laravel/storage/framework/views
+RUN mkdir -p /laravel/storage/framework/cache
+
+RUN chmod -R 777 /laravel
+
 RUN composer.phar install --no-progress
 
 RUN php artisan config:cache

+ 2 - 2
frameworks/PHP/limonade/deploy/nginx.conf

@@ -8,7 +8,7 @@ events {
 }
 
 http {
-    include       /nginx/conf/mime.types;
+    include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
     access_log off;
     server_tokens off;
@@ -57,7 +57,7 @@ http {
             fastcgi_keep_conn on;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-            include        /nginx/conf/fastcgi_params;
+            include        /etc/nginx/fastcgi_params;
         }
     }
 }

+ 16 - 1
frameworks/PHP/limonade/limonade.dockerfile

@@ -1,4 +1,19 @@
-FROM techempower/php7:0.1
+FROM ubuntu:16.04
+
+RUN apt update -yqq && apt install -yqq software-properties-common
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
+RUN apt-get update -yqq
+RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql php7.2-xml php7.2-mbstring php7.2-mongodb
+
+RUN mkdir /composer
+WORKDIR /composer
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+RUN php composer-setup.php
+RUN php -r "unlink('composer-setup.php');"
+
+ENV PATH /composer:${PATH}
 
 ADD ./ /limonade
 WORKDIR /limonade

+ 2 - 2
frameworks/PHP/lithium/deploy/nginx.conf

@@ -8,7 +8,7 @@ events {
 }
 
 http {
-    include       /nginx/conf/mime.types;
+    include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
     access_log off;
     server_tokens off;
@@ -57,7 +57,7 @@ http {
             fastcgi_keep_conn on;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-            include        /nginx/conf/fastcgi_params;
+            include        /etc/nginx/fastcgi_params;
         }
     }
 }

+ 16 - 1
frameworks/PHP/lithium/lithium.dockerfile

@@ -1,4 +1,19 @@
-FROM techempower/php5:0.1
+FROM ubuntu:16.04
+
+RUN apt update -yqq && apt install -yqq software-properties-common
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
+RUN apt-get update -yqq
+RUN apt-get install -yqq nginx git unzip php5.6 php5.6-common php5.6-cli php5.6-fpm php5.6-mysql php5.6-xml php5.6-mbstring php5.6-mcrypt
+
+RUN mkdir /composer
+WORKDIR /composer
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+RUN php composer-setup.php
+RUN php -r "unlink('composer-setup.php');"
+
+ENV PATH /composer:${PATH}
 
 ADD ./ /lithium
 WORKDIR /lithium

+ 2 - 2
frameworks/PHP/lumen/deploy/nginx.conf

@@ -8,7 +8,7 @@ events {
 }
 
 http {
-    include       /nginx/conf/mime.types;
+    include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
     access_log off;
     server_tokens off;
@@ -57,7 +57,7 @@ http {
             fastcgi_keep_conn on;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-            include        /nginx/conf/fastcgi_params;
+            include        /etc/nginx/fastcgi_params;
         }
     }
 }

+ 21 - 1
frameworks/PHP/lumen/lumen.dockerfile

@@ -1,10 +1,30 @@
-FROM techempower/php7:0.1
+FROM ubuntu:16.04
+
+RUN apt update -yqq && apt install -yqq software-properties-common
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
+RUN apt-get update -yqq
+RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql php7.2-xml php7.2-mbstring php7.2-mongodb
+
+RUN mkdir /composer
+WORKDIR /composer
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+RUN php composer-setup.php
+RUN php -r "unlink('composer-setup.php');"
+
+ENV PATH /composer:${PATH}
 
 ADD ./ /lumen
 WORKDIR /lumen
 
 RUN composer.phar install --no-progress
 
+RUN mkdir -p /lumen/storage
+RUN mkdir -p /lumen/storage/framework/sessions
+RUN mkdir -p /lumen/storage/framework/views
+RUN mkdir -p /lumen/storage/framework/cache
+
 RUN chmod -R 777 /lumen
 
 CMD service php7.2-fpm start && \

+ 1 - 7
frameworks/PHP/peachpie/peachpie.dockerfile

@@ -1,4 +1,4 @@
-FROM techempower/base:0.1
+FROM microsoft/dotnet:2.0-sdk-jessie
 
 ADD ./ /peachpie
 WORKDIR /peachpie
@@ -6,12 +6,6 @@ WORKDIR /peachpie
 ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE true
 ENV DOTNET_CLI_TELEMETRY_OPTOUT true
 
-RUN apt-get install apt-transport-https
-RUN curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > /etc/apt/trusted.gpg.d/microsoft.gpg
-RUN sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-xenial-prod xenial main" > /etc/apt/sources.list.d/dotnetdev.list'
-RUN apt-get update
-RUN apt-get install -y dotnet-sdk-2.1.4
-
 ENV PATH="/root/.dotnet:${PATH}"
 
 CMD dotnet run -p Server -c Release

+ 0 - 1
frameworks/PHP/phalcon/app/controllers/BenchController.php

@@ -70,7 +70,6 @@ class BenchController extends \Phalcon\Mvc\Controller
     public function plaintextAction()
     {
         $this->view->disable();
-        $this->response->setStatusCode(200, "OK");
         $this->response->setContentType('text/plain');
         $this->response->setContent("Hello, World!");
         $this->response->send();

+ 2 - 2
frameworks/PHP/phalcon/deploy/nginx.conf

@@ -8,7 +8,7 @@ events {
 }
 
 http {
-    include       /nginx/conf/mime.types;
+    include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
     access_log off;
     server_tokens off;
@@ -57,7 +57,7 @@ http {
             fastcgi_keep_conn on;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-            include        /nginx/conf/fastcgi_params;
+            include        /etc/nginx/fastcgi_params;
         }
     }
 }

+ 0 - 10
frameworks/PHP/phalcon/phalcon-base.dockerfile

@@ -1,10 +0,0 @@
-FROM techempower/php7:0.1
-
-ADD ./ /phalcon
-WORKDIR /phalcon
-
-RUN apt-get install -y php7.2-phalcon
-
-RUN composer.phar install --no-progress
-
-RUN chmod -R 777 app

+ 16 - 7
frameworks/PHP/phalcon/phalcon-micro.dockerfile

@@ -1,16 +1,25 @@
-FROM techempower/php7:0.1
+FROM ubuntu:16.04
+
+RUN apt update -yqq && apt install -yqq software-properties-common
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
+RUN apt-get update -yqq
+RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql php7.2-xml php7.2-mbstring php7.2-mongodb
+
+RUN mkdir /composer
+WORKDIR /composer
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+RUN php composer-setup.php
+RUN php -r "unlink('composer-setup.php');"
+
+ENV PATH /composer:${PATH}
 
 ADD ./ /phalcon
 WORKDIR /phalcon
 
 RUN apt install -yqq php7.2-phalcon php7.2-dev
 
-ENV VERSION="3.3.1"
-
-RUN wget -q https://github.com/phalcon/cphalcon/archive/v${VERSION}.tar.gz
-RUN tar xf v${VERSION}.tar.gz
-RUN cd cphalcon-${VERSION}/build && ./install
-
 RUN mv /phalcon/public/index-micro.php /phalcon/public/index.php
 
 RUN chmod -R 777 app

+ 25 - 1
frameworks/PHP/phalcon/phalcon-mongodb.dockerfile

@@ -1,4 +1,28 @@
-FROM techempower/phalcon-base:0.1
+FROM ubuntu:16.04
+
+RUN apt update -yqq && apt install -yqq software-properties-common
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
+RUN apt-get update -yqq
+RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql php7.2-xml php7.2-mbstring php7.2-mongodb
+
+RUN mkdir /composer
+WORKDIR /composer
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+RUN php composer-setup.php
+RUN php -r "unlink('composer-setup.php');"
+
+ENV PATH /composer:${PATH}
+
+ADD ./ /phalcon
+WORKDIR /phalcon
+
+RUN apt install -yqq php7.2-phalcon
+
+RUN composer.phar install --no-progress
+
+RUN chmod -R 777 app
 
 CMD service php7.2-fpm start && \
     nginx -c /phalcon/deploy/nginx.conf -g "daemon off;"

+ 25 - 1
frameworks/PHP/phalcon/phalcon.dockerfile

@@ -1,4 +1,28 @@
-FROM techempower/phalcon-base:0.1
+FROM ubuntu:16.04
+
+RUN apt update -yqq && apt install -yqq software-properties-common
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
+RUN apt-get update -yqq
+RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql php7.2-xml php7.2-mbstring php7.2-mongodb
+
+RUN mkdir /composer
+WORKDIR /composer
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+RUN php composer-setup.php
+RUN php -r "unlink('composer-setup.php');"
+
+ENV PATH /composer:${PATH}
+
+ADD ./ /phalcon
+WORKDIR /phalcon
+
+RUN apt install -yqq php7.2-phalcon
+
+RUN composer.phar install --no-progress
+
+RUN chmod -R 777 app
 
 CMD service php7.2-fpm start && \
     nginx -c /phalcon/deploy/nginx.conf -g "daemon off;"

+ 18 - 0
frameworks/PHP/php/benchmark_config.json

@@ -84,6 +84,24 @@
       "display_name": "PHP-raw",
       "notes": "",
       "versus": "php-php5"
+    },
+    "swoole": {
+      "json_url": "/json",
+      "port": 8080,
+      "approach": "Realistic",
+      "classification": "Platform",
+      "database": "None",
+      "framework": "None",
+      "language": "PHP",
+      "flavor": "PHP7",
+      "orm": "Raw",
+      "platform": "None",
+      "webserver": "swoole",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "PHP-swool",
+      "notes": "",
+      "versus": "php7"
     }
   }]
 }

+ 2 - 2
frameworks/PHP/php/deploy/nginx5.conf

@@ -8,7 +8,7 @@ events {
 }
 
 http {
-    include       /nginx/conf/mime.types;
+    include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
     access_log off;
     server_tokens off;
@@ -57,7 +57,7 @@ http {
             fastcgi_keep_conn on;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-            include        /nginx/conf/fastcgi_params;
+            include        /etc/nginx/fastcgi_params;
         }
     }
 }

+ 2 - 2
frameworks/PHP/php/deploy/nginx7.conf

@@ -8,7 +8,7 @@ events {
 }
 
 http {
-    include       /nginx/conf/mime.types;
+    include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
     access_log off;
     server_tokens off;
@@ -57,7 +57,7 @@ http {
             fastcgi_keep_conn on;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-            include        /nginx/conf/fastcgi_params;
+            include        /etc/nginx/fastcgi_params;
         }
     }
 }

+ 23 - 1
frameworks/PHP/php/php-php5-raw.dockerfile

@@ -1,4 +1,26 @@
-FROM techempower/php5-base:0.1
+FROM ubuntu:16.04
+
+RUN apt update -yqq && apt install -yqq software-properties-common
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
+RUN apt-get update -yqq
+RUN apt-get install -yqq nginx git unzip php5.6 php5.6-common php5.6-cli php5.6-fpm php5.6-mysql php5.6-xml php5.6-mbstring php5.6-mcrypt
+
+RUN mkdir /composer
+WORKDIR /composer
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+RUN php composer-setup.php
+RUN php -r "unlink('composer-setup.php');"
+
+ENV PATH /composer:${PATH}
+
+ADD ./ /php
+WORKDIR /php
+
+RUN composer.phar install --no-progress
+
+RUN chmod -R 777 /php
 
 CMD service php5.6-fpm start && \
     nginx -c /php/deploy/nginx5.conf -g "daemon off;"

+ 23 - 1
frameworks/PHP/php/php-php5.dockerfile

@@ -1,4 +1,26 @@
-FROM techempower/php5-base:0.1
+FROM ubuntu:16.04
+
+RUN apt update -yqq && apt install -yqq software-properties-common
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
+RUN apt-get update -yqq
+RUN apt-get install -yqq nginx git unzip php5.6 php5.6-common php5.6-cli php5.6-fpm php5.6-mysql php5.6-xml php5.6-mbstring php5.6-mcrypt
+
+RUN mkdir /composer
+WORKDIR /composer
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+RUN php composer-setup.php
+RUN php -r "unlink('composer-setup.php');"
+
+ENV PATH /composer:${PATH}
+
+ADD ./ /php
+WORKDIR /php
+
+RUN composer.phar install --no-progress
+
+RUN chmod -R 777 /php
 
 CMD service php5.6-fpm start && \
     nginx -c /php/deploy/nginx5.conf -g "daemon off;"

+ 23 - 1
frameworks/PHP/php/php-raw7.dockerfile

@@ -1,4 +1,26 @@
-FROM techempower/php7-base:0.1
+FROM ubuntu:16.04
+
+RUN apt update -yqq && apt install -yqq software-properties-common
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
+RUN apt-get update -yqq
+RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql php7.2-xml php7.2-mbstring php7.2-mongodb
+
+RUN mkdir /composer
+WORKDIR /composer
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+RUN php composer-setup.php
+RUN php -r "unlink('composer-setup.php');"
+
+ENV PATH /composer:${PATH}
+
+ADD ./ /php
+WORKDIR /php
+
+RUN composer.phar install --no-progress
+
+RUN chmod -R 777 /php
 
 CMD service php7.2-fpm start && \
     nginx -c /php/deploy/nginx7.conf -g "daemon off;"

+ 14 - 0
frameworks/PHP/php/php-swoole.dockerfile

@@ -0,0 +1,14 @@
+FROM php:7.2
+
+ENV SWOOLE_VERSION=2.0.9
+
+RUN cd /tmp && curl -sSL "https://github.com/swoole/swoole-src/archive/v${SWOOLE_VERSION}.tar.gz" | tar xzf - \
+        && cd swoole-src-${SWOOLE_VERSION} \
+        && phpize && ./configure && make && make install \
+        && docker-php-ext-enable swoole
+
+ADD ./ /swoole
+WORKDIR /swoole
+
+CMD sed -i 's|NUMCORES|'"$(nproc)"'|g' swoole-server.php && \
+    php swoole-server.php

+ 23 - 1
frameworks/PHP/php/php.dockerfile

@@ -1,4 +1,26 @@
-FROM techempower/php7-base:0.1
+FROM ubuntu:16.04
+
+RUN apt update -yqq && apt install -yqq software-properties-common
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
+RUN apt-get update -yqq
+RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql php7.2-xml php7.2-mbstring php7.2-mongodb
+
+RUN mkdir /composer
+WORKDIR /composer
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+RUN php composer-setup.php
+RUN php -r "unlink('composer-setup.php');"
+
+ENV PATH /composer:${PATH}
+
+ADD ./ /php
+WORKDIR /php
+
+RUN composer.phar install --no-progress
+
+RUN chmod -R 777 /php
 
 CMD service php7.2-fpm start && \
     nginx -c /php/deploy/nginx7.conf -g "daemon off;"

+ 0 - 8
frameworks/PHP/php/php5-base.dockerfile

@@ -1,8 +0,0 @@
-FROM techempower/php5:0.1
-
-ADD ./ /php
-WORKDIR /php
-
-RUN composer.phar install --no-progress
-
-RUN chmod -R 777 /php

+ 0 - 8
frameworks/PHP/php/php7-base.dockerfile

@@ -1,8 +0,0 @@
-FROM techempower/php7:0.1
-
-ADD ./ /php
-WORKDIR /php
-
-RUN composer.phar install --no-progress
-
-RUN chmod -R 777 /php

+ 10 - 0
frameworks/PHP/php/swoole-server.php

@@ -0,0 +1,10 @@
+<?php
+$server = new swoole_http_server('0.0.0.0', 8080);
+$server->set(array(
+    'worker_num' => NUMCORES,
+));
+$server->on('request', function ($req, $res) {
+    $res->header('Content-type', 'application/json');
+    $res->end(json_encode(array('message' => 'Hello, World!')));
+});
+$server->start();

+ 2 - 2
frameworks/PHP/phpixie/deploy/nginx.conf

@@ -8,7 +8,7 @@ events {
 }
 
 http {
-    include       /nginx/conf/mime.types;
+    include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
     access_log off;
     server_tokens off;
@@ -57,7 +57,7 @@ http {
             fastcgi_keep_conn on;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-            include        /nginx/conf/fastcgi_params;
+            include        /etc/nginx/fastcgi_params;
         }
     }
 }

+ 16 - 1
frameworks/PHP/phpixie/phpixie.dockerfile

@@ -1,4 +1,19 @@
-FROM techempower/php7:0.1
+FROM ubuntu:16.04
+
+RUN apt update -yqq && apt install -yqq software-properties-common
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
+RUN apt-get update -yqq
+RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql php7.2-xml php7.2-mbstring php7.2-mongodb
+
+RUN mkdir /composer
+WORKDIR /composer
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+RUN php composer-setup.php
+RUN php -r "unlink('composer-setup.php');"
+
+ENV PATH /composer:${PATH}
 
 ADD ./ /phpixie
 WORKDIR /phpixie

+ 2 - 2
frameworks/PHP/phreeze/deploy/nginx.conf

@@ -8,7 +8,7 @@ events {
 }
 
 http {
-    include       /nginx/conf/mime.types;
+    include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
     access_log off;
     server_tokens off;
@@ -57,7 +57,7 @@ http {
             fastcgi_keep_conn on;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-            include        /nginx/conf/fastcgi_params;
+            include        /etc/nginx/fastcgi_params;
         }
     }
 }

+ 16 - 1
frameworks/PHP/phreeze/phreeze.dockerfile

@@ -1,4 +1,19 @@
-FROM techempower/php5:0.1
+FROM ubuntu:16.04
+
+RUN apt update -yqq && apt install -yqq software-properties-common
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
+RUN apt-get update -yqq
+RUN apt-get install -yqq nginx git unzip php5.6 php5.6-common php5.6-cli php5.6-fpm php5.6-mysql php5.6-xml php5.6-mbstring php5.6-mcrypt
+
+RUN mkdir /composer
+WORKDIR /composer
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+RUN php composer-setup.php
+RUN php -r "unlink('composer-setup.php');"
+
+ENV PATH /composer:${PATH}
 
 ADD ./ /phreeze
 WORKDIR /phreeze

+ 2 - 2
frameworks/PHP/silex/deploy/nginx.conf

@@ -8,7 +8,7 @@ events {
 }
 
 http {
-    include       /nginx/conf/mime.types;
+    include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
     access_log off;
     server_tokens off;
@@ -57,7 +57,7 @@ http {
             fastcgi_keep_conn on;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-            include        /nginx/conf/fastcgi_params;
+            include        /etc/nginx/fastcgi_params;
         }
     }
 }

+ 0 - 6
frameworks/PHP/silex/silex-base.dockerfile

@@ -1,6 +0,0 @@
-FROM techempower/php7:0.1
-
-ADD ./ /silex
-WORKDIR /silex
-
-RUN composer.phar install --no-progress

+ 21 - 1
frameworks/PHP/silex/silex-raw.dockerfile

@@ -1,4 +1,24 @@
-FROM techempower/silex-base:0.1
+FROM ubuntu:16.04
+
+RUN apt update -yqq && apt install -yqq software-properties-common
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
+RUN apt-get update -yqq
+RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql php7.2-xml php7.2-mbstring php7.2-mongodb
+
+RUN mkdir /composer
+WORKDIR /composer
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+RUN php composer-setup.php
+RUN php -r "unlink('composer-setup.php');"
+
+ENV PATH /composer:${PATH}
+
+ADD ./ /silex
+WORKDIR /silex
+
+RUN composer.phar install --no-progress
 
 RUN mv /silex/web/index_raw.php /silex/web/index.php
 

+ 21 - 1
frameworks/PHP/silex/silex.dockerfile

@@ -1,4 +1,24 @@
-FROM techempower/silex-base:0.1
+FROM ubuntu:16.04
+
+RUN apt update -yqq && apt install -yqq software-properties-common
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
+RUN apt-get update -yqq
+RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql php7.2-xml php7.2-mbstring php7.2-mongodb
+
+RUN mkdir /composer
+WORKDIR /composer
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+RUN php composer-setup.php
+RUN php -r "unlink('composer-setup.php');"
+
+ENV PATH /composer:${PATH}
+
+ADD ./ /silex
+WORKDIR /silex
+
+RUN composer.phar install --no-progress
 
 CMD service php7.2-fpm start && \
     nginx -c /silex/deploy/nginx.conf -g "daemon off;"

+ 2 - 2
frameworks/PHP/slim/deploy/nginx-fpm-5.conf

@@ -8,7 +8,7 @@ events {
 }
 
 http {
-    include       /nginx/conf/mime.types;
+    include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
     access_log off;
     server_tokens off;
@@ -57,7 +57,7 @@ http {
             fastcgi_keep_conn on;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-            include        /nginx/conf/fastcgi_params;
+            include        /etc/nginx/fastcgi_params;
         }
     }
 }

+ 2 - 2
frameworks/PHP/slim/deploy/nginx-fpm-7.conf

@@ -8,7 +8,7 @@ events {
 }
 
 http {
-    include       /nginx/conf/mime.types;
+    include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
     access_log off;
     server_tokens off;
@@ -57,7 +57,7 @@ http {
             fastcgi_keep_conn on;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-            include        /nginx/conf/fastcgi_params;
+            include        /etc/nginx/fastcgi_params;
         }
     }
 }

+ 2 - 2
frameworks/PHP/slim/deploy/nginx-hhvm.conf

@@ -8,7 +8,7 @@ events {
 }
 
 http {
-    include       /nginx/conf/mime.types;
+    include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
     access_log off;
     server_tokens off;
@@ -56,7 +56,7 @@ http {
             fastcgi_keep_conn on;
             fastcgi_index index.php;
             fastcgi_param SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-            include /nginx/conf/fastcgi_params;
+            include /etc/nginx/fastcgi_params;
         }
     }
 }

+ 18 - 1
frameworks/PHP/slim/slim-hhvm.dockerfile

@@ -1,4 +1,21 @@
-FROM techempower/hhvm-php5:0.1
+FROM ubuntu:16.04
+
+RUN apt update -yqq && apt install -yqq software-properties-common apt-transport-https
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
+RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xB4112585D386EB94
+RUN add-apt-repository https://dl.hhvm.com/ubuntu
+RUN apt-get update -yqq
+RUN apt-get install -yqq hhvm nginx git unzip php5.6 php5.6-common php5.6-cli php5.6-fpm php5.6-mysql php5.6-xml php5.6-mbstring php5.6-mcrypt
+
+RUN mkdir /composer
+WORKDIR /composer
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+RUN php composer-setup.php
+RUN php -r "unlink('composer-setup.php');"
+
+ENV PATH /composer:${PATH}
 
 ADD ./ /slim
 WORKDIR /slim

+ 16 - 1
frameworks/PHP/slim/slim-php5.dockerfile

@@ -1,4 +1,19 @@
-FROM techempower/php5:0.1
+FROM ubuntu:16.04
+
+RUN apt update -yqq && apt install -yqq software-properties-common
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
+RUN apt-get update -yqq
+RUN apt-get install -yqq nginx git unzip php5.6 php5.6-common php5.6-cli php5.6-fpm php5.6-mysql php5.6-xml php5.6-mbstring php5.6-mcrypt
+
+RUN mkdir /composer
+WORKDIR /composer
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+RUN php composer-setup.php
+RUN php -r "unlink('composer-setup.php');"
+
+ENV PATH /composer:${PATH}
 
 ADD ./ /slim
 WORKDIR /slim

+ 16 - 1
frameworks/PHP/slim/slim.dockerfile

@@ -1,4 +1,19 @@
-FROM techempower/php7:0.1
+FROM ubuntu:16.04
+
+RUN apt update -yqq && apt install -yqq software-properties-common
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
+RUN apt-get update -yqq
+RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql php7.2-xml php7.2-mbstring php7.2-mongodb
+
+RUN mkdir /composer
+WORKDIR /composer
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+RUN php composer-setup.php
+RUN php -r "unlink('composer-setup.php');"
+
+ENV PATH /composer:${PATH}
 
 ADD ./ /slim
 WORKDIR /slim

+ 2 - 2
frameworks/PHP/symfony/deploy/nginx.conf

@@ -8,7 +8,7 @@ events {
 }
 
 http {
-    include       /nginx/conf/mime.types;
+    include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
     access_log off;
     server_tokens off;
@@ -57,7 +57,7 @@ http {
             fastcgi_keep_conn on;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-            include        /nginx/conf/fastcgi_params;
+            include        /etc/nginx/fastcgi_params;
         }
     }
 }

+ 0 - 17
frameworks/PHP/symfony/symfony-base.dockerfile

@@ -1,17 +0,0 @@
-FROM techempower/php7:0.1
-
-ADD ./ /symfony
-WORKDIR /symfony
-
-ENV APP_ENV=prod
-
-RUN composer.phar install --no-progress
-
-RUN php bin/console cache:clear --env=prod --no-debug --no-warmup
-RUN php bin/console cache:warmup --env=prod --no-debug
-
-RUN mkdir -p /symfony/var/cache/dev
-RUN chmod 777 -R /symfony/var/cache/dev
-
-RUN mkdir -p /symfony/var/log
-RUN chmod 777 -R /symfony/var/log

+ 32 - 1
frameworks/PHP/symfony/symfony-raw.dockerfile

@@ -1,4 +1,35 @@
-FROM techempower/symfony-base:0.1
+FROM ubuntu:16.04
+
+RUN apt update -yqq && apt install -yqq software-properties-common
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
+RUN apt-get update -yqq
+RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql php7.2-xml php7.2-mbstring php7.2-mongodb
+
+RUN mkdir /composer
+WORKDIR /composer
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+RUN php composer-setup.php
+RUN php -r "unlink('composer-setup.php');"
+
+ENV PATH /composer:${PATH}
+
+ADD ./ /symfony
+WORKDIR /symfony
+
+ENV APP_ENV=prod
+
+RUN composer.phar install --no-progress
+
+RUN php bin/console cache:clear --env=prod --no-debug --no-warmup
+RUN php bin/console cache:warmup --env=prod --no-debug
+
+RUN mkdir -p /symfony/var/cache/dev
+RUN chmod 777 -R /symfony/var/cache/dev
+
+RUN mkdir -p /symfony/var/log
+RUN chmod 777 -R /symfony/var/log
 
 CMD service php7.2-fpm start && \
     nginx -c /symfony/deploy/nginx.conf -g "daemon off;"

+ 32 - 1
frameworks/PHP/symfony/symfony.dockerfile

@@ -1,4 +1,35 @@
-FROM techempower/symfony-base:0.1
+FROM ubuntu:16.04
+
+RUN apt update -yqq && apt install -yqq software-properties-common
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
+RUN apt-get update -yqq
+RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql php7.2-xml php7.2-mbstring php7.2-mongodb
+
+RUN mkdir /composer
+WORKDIR /composer
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+RUN php composer-setup.php
+RUN php -r "unlink('composer-setup.php');"
+
+ENV PATH /composer:${PATH}
+
+ADD ./ /symfony
+WORKDIR /symfony
+
+ENV APP_ENV=prod
+
+RUN composer.phar install --no-progress
+
+RUN php bin/console cache:clear --env=prod --no-debug --no-warmup
+RUN php bin/console cache:warmup --env=prod --no-debug
+
+RUN mkdir -p /symfony/var/cache/dev
+RUN chmod 777 -R /symfony/var/cache/dev
+
+RUN mkdir -p /symfony/var/log
+RUN chmod 777 -R /symfony/var/log
 
 CMD service php7.2-fpm start && \
     nginx -c /symfony/deploy/nginx.conf -g "daemon off;"

+ 16 - 1
frameworks/PHP/workerman/workerman.dockerfile

@@ -1,4 +1,19 @@
-FROM techempower/php7:0.1
+FROM ubuntu:16.04
+
+RUN apt update -yqq && apt install -yqq software-properties-common
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
+RUN apt-get update -yqq
+RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql php7.2-xml php7.2-mbstring php7.2-mongodb
+
+RUN mkdir /composer
+WORKDIR /composer
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+RUN php composer-setup.php
+RUN php -r "unlink('composer-setup.php');"
+
+ENV PATH /composer:${PATH}
 
 ADD ./ /workerman
 WORKDIR /workerman

+ 2 - 2
frameworks/PHP/yii2/deploy/nginx-fpm.conf

@@ -7,7 +7,7 @@ events {
 }
 
 http {
-    include /nginx/conf/mime.types;
+    include /etc/nginx/mime.types;
     default_type application/octet-stream;
     access_log off;
     server_tokens off;
@@ -41,7 +41,7 @@ http {
             fastcgi_param  SCRIPT_FILENAME  $document_root$fsn;
             fastcgi_param  PATH_INFO        $fastcgi_path_info;
             fastcgi_param  PATH_TRANSLATED  $document_root$fsn;
-            include /nginx/conf/fastcgi_params;
+            include /etc/nginx/fastcgi_params;
         }
     }
 }

+ 2 - 2
frameworks/PHP/yii2/deploy/nginx-hhvm.conf

@@ -7,7 +7,7 @@ events {
 }
 
 http {
-    include /nginx/conf/mime.types;
+    include /etc/nginx/mime.types;
     default_type application/octet-stream;
     access_log off;
     server_tokens off;
@@ -41,7 +41,7 @@ http {
             fastcgi_param  SCRIPT_FILENAME  $document_root$fsn;
             fastcgi_param  PATH_INFO        $fastcgi_path_info;
             fastcgi_param  PATH_TRANSLATED  $document_root$fsn;
-            include /nginx/conf/fastcgi_params;
+            include /etc/nginx/fastcgi_params;
         }
     }
 }

+ 19 - 1
frameworks/PHP/yii2/yii2-hhvm.dockerfile

@@ -1,4 +1,22 @@
-FROM techempower/hhvm-php7:0.1
+FROM ubuntu:16.04
+
+RUN apt update -yqq && apt install -yqq software-properties-common apt-transport-https
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
+RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xB4112585D386EB94
+RUN add-apt-repository https://dl.hhvm.com/ubuntu
+RUN apt-get update -yqq
+RUN apt install -yqq hhvm nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql php7.2-xml php7.2-mbstring php7.2-mongodb
+
+RUN mkdir /composer
+WORKDIR /composer
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+RUN php composer-setup.php
+RUN php -r "unlink('composer-setup.php');"
+
+ENV PATH /composer:${PATH}
+
 
 ADD ./ /yii2
 WORKDIR /yii2

+ 16 - 1
frameworks/PHP/yii2/yii2.dockerfile

@@ -1,4 +1,19 @@
-FROM techempower/php7:0.1
+FROM ubuntu:16.04
+
+RUN apt update -yqq && apt install -yqq software-properties-common
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
+RUN apt-get update -yqq
+RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql php7.2-xml php7.2-mbstring php7.2-mongodb
+
+RUN mkdir /composer
+WORKDIR /composer
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+RUN php composer-setup.php
+RUN php -r "unlink('composer-setup.php');"
+
+ENV PATH /composer:${PATH}
 
 ADD ./ /yii2
 WORKDIR /yii2

+ 2 - 2
frameworks/PHP/zend/deploy/nginx.conf

@@ -7,7 +7,7 @@ events {
 }
 
 http {
-    include       /nginx/conf/mime.types;
+    include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
 
     access_log off;
@@ -39,7 +39,7 @@ http {
             fastcgi_keep_conn on;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-            include        /nginx/conf/fastcgi_params;
+            include        /etc/nginx/fastcgi_params;
         }
     }
 }

+ 16 - 1
frameworks/PHP/zend/zend.dockerfile

@@ -1,4 +1,19 @@
-FROM techempower/php7:0.1
+FROM ubuntu:16.04
+
+RUN apt update -yqq && apt install -yqq software-properties-common
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
+RUN apt-get update -yqq
+RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql php7.2-xml php7.2-mbstring php7.2-mongodb
+
+RUN mkdir /composer
+WORKDIR /composer
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+RUN php composer-setup.php
+RUN php -r "unlink('composer-setup.php');"
+
+ENV PATH /composer:${PATH}
 
 ADD ./ /zend
 WORKDIR /zend

+ 2 - 2
frameworks/PHP/zend1/deploy/nginx.conf

@@ -7,7 +7,7 @@ events {
 }
 
 http {
-    include       /nginx/conf/mime.types;
+    include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
 
     access_log off;
@@ -39,7 +39,7 @@ http {
             fastcgi_keep_conn on;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-            include        /nginx/conf/fastcgi_params;
+            include        /etc/nginx/fastcgi_params;
         }
     }
 }

+ 16 - 1
frameworks/PHP/zend1/zend1.dockerfile

@@ -1,4 +1,19 @@
-FROM techempower/php7:0.1
+FROM ubuntu:16.04
+
+RUN apt update -yqq && apt install -yqq software-properties-common
+RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
+RUN apt-get update -yqq
+RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql php7.2-xml php7.2-mbstring php7.2-mongodb
+
+RUN mkdir /composer
+WORKDIR /composer
+
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
+RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
+RUN php composer-setup.php
+RUN php -r "unlink('composer-setup.php');"
+
+ENV PATH /composer:${PATH}
 
 ADD ./ /zend1
 WORKDIR /zend1

+ 0 - 7
toolset/setup/docker/languages/hhvm-php5.dockerfile

@@ -1,7 +0,0 @@
-FROM techempower/php5:0.1
-
-RUN apt-get install -y apt-transport-https
-RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xB4112585D386EB94
-RUN add-apt-repository https://dl.hhvm.com/ubuntu
-RUN apt-get update
-RUN apt-get install -y hhvm

+ 0 - 7
toolset/setup/docker/languages/hhvm-php7.dockerfile

@@ -1,7 +0,0 @@
-FROM techempower/php7:0.1
-
-RUN apt-get install -y apt-transport-https
-RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xB4112585D386EB94
-RUN add-apt-repository https://dl.hhvm.com/ubuntu
-RUN apt-get update
-RUN apt-get install -y hhvm

+ 0 - 15
toolset/setup/docker/languages/php5.dockerfile

@@ -1,15 +0,0 @@
-FROM techempower/nginx:0.1
-
-RUN add-apt-repository ppa:ondrej/php
-RUN apt-get update
-RUN apt-get install -y php5.6 php5.6-common php5.6-cli php5.6-fpm php5.6-mysql php5.6-xml php5.6-mbstring php5.6-mcrypt
-
-RUN mkdir /composer
-WORKDIR /composer
-
-RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
-RUN php composer-setup.php
-RUN php -r "unlink('composer-setup.php');"
-
-ENV PATH /composer:${PATH}

+ 0 - 15
toolset/setup/docker/languages/php7.dockerfile

@@ -1,15 +0,0 @@
-FROM techempower/nginx:0.1
-
-RUN add-apt-repository ppa:ondrej/php
-RUN apt-get update
-RUN apt-get install -y php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql php7.2-xml php7.2-mbstring php7.2-mongodb
-
-RUN mkdir /composer
-WORKDIR /composer
-
-RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
-RUN php composer-setup.php
-RUN php -r "unlink('composer-setup.php');"
-
-ENV PATH /composer:${PATH}