Merge pull request #21 from devilbox/release-0.26

Add HTTP/2 support for SSL connections

Author: cytopia

Dockerfile

@@ -10,7 +10,7 @@ LABEL \
 ###
 ### Build arguments
 ###
-ARG VHOST_GEN_GIT_REF=0.12
+ARG VHOST_GEN_GIT_REF=0.13
 ARG CERT_GEN_GIT_REF=0.2
 
 ENV BUILD_DEPS \

README.md

@@ -12,6 +12,8 @@ This image is based on the official **[Nginx](https://hub.docker.com/_/nginx)**
 
 From a users perspective, you mount your local project directory into the container under `/shared/httpd`. Any directory then created in your local project directory wil spawn a new virtual host by the same name. Additional settings such as custom server names, PHP-FPM or even different Apache templates per project are supported as well.
 
+**HTTP/2 is enabled by default for all SSL connections.**
+
 | Docker Hub | Upstream Project |
 |------------|------------------|
 | <a href="https://hub.docker.com/r/devilbox/nginx-stable"><img height="82px" src="http://dockeri.co/image/devilbox/nginx-stable" /></a> | <a href="https://github.com/cytopia/devilbox" ><img height="82px" src="https://raw.githubusercontent.com/devilbox/artwork/master/submissions_banner/cytopia/01/png/banner_256_trans.png" /></a> |
@@ -249,7 +251,7 @@ It offers pre-configured mass virtual hosts and an intranet.
 
 It allows any of the following combinations:
 
-* PHP 5.4, PHP 5.5, PHP 5.6, PHP 7.0, PHP 7.1 and HHVM
+* PHP 5.2, 5.3, 5.4, PHP 5.5, PHP 5.6, PHP 7.0, PHP 7.1, 7.2, 7.3 and 7.4
 * MySQL 5.5, MySQL 5.6, MySQL 5.7, MariaDB 5 and MariaDB 10
 * Apache 2.2, Apache 2.4, Nginx stable and Nginx mainline
 * And more to come...
@@ -258,5 +260,5 @@ It allows any of the following combinations:
 ## Version
 
 ```
-nginx version: nginx/1.14.2
+nginx version: nginx/1.14.2
 ```

data/vhost-gen/main.yml

@@ -94,6 +94,7 @@ vhost:
     - index.htm
   # SSL Definition
   ssl:
+    http2: True
     dir_crt: /etc/httpd/cert/main
     dir_key: /etc/httpd/cert/main
     protocols: 'TLSv1 TLSv1.1 TLSv1.2'

data/vhost-gen/mass.yml

@@ -94,6 +94,7 @@ vhost:
     - index.htm
   # SSL Definition
   ssl:
+    http2: True
     dir_crt: /etc/httpd/cert/mass
     dir_key: /etc/httpd/cert/mass
     protocols: 'TLSv1 TLSv1.1 TLSv1.2'

data/vhost-gen/templates-main/nginx.yml

@@ -55,7 +55,7 @@
 ###
 vhost: |
   server {
-      listen       __PORT____DEFAULT_VHOST__;
+      listen       __PORT____HTTP_PROTO____DEFAULT_VHOST__;
       server_name  __VHOST_NAME__;
 
       access_log   "__ACCESS_LOG__" combined;