DVL-005 changing service combinations

This commit is contained in:
cytopia 2017-04-21 21:15:31 +02:00
parent 311505beec
commit 9b19cc0cf7
No known key found for this signature in database
GPG Key ID: 6D56EDB8695128A2
3 changed files with 6 additions and 4 deletions

View File

@ -67,8 +67,8 @@ set_host_port_pgsql "54320"
###
### Docker default versions to use
###
_httpd="apache-2.2"
_mysql="mariadb-10.2"
_httpd="nginx-stable"
_mysql="mariadb-10.1"
_pgsql="9.6"
_php="php-fpm-7.0"

View File

@ -87,6 +87,8 @@ No need to install and configure different versions locally. Simply choose your
| | [![Build Status](https://travis-ci.org/cytopia/docker-mariadb-10.1.svg?branch=master)](https://travis-ci.org/cytopia/docker-mariadb-10.1) [MariaDB 10.1](https://github.com/cytopia/docker-mariadb-10.1) | | [![Build Status](https://travis-ci.org/cytopia/docker-hhvm-latest.svg?branch=master)](https://travis-ci.org/cytopia/docker-hhvm-latest) [HHVM latest](https://github.com/cytopia/docker-hhvm-latest)
| | [![Build Status](https://travis-ci.org/cytopia/docker-mariadb-10.2.svg?branch=master)](https://travis-ci.org/cytopia/docker-mariadb-10.2) [MariaDB 10.2](https://github.com/cytopia/docker-mariadb-10.2) | |
<sub>**Incompatible choices:**<sub><br/>
<sub>- Apache 2.2 and HHVM do not work together</sub>
**Optional NoSQL stack**

View File

@ -63,8 +63,8 @@ LOCAL_LISTEN_ADDR=127.0.0.1:
### 1.1 Choose HTTP Server Image
###
#HTTPD_SERVER=apache-2.2
HTTPD_SERVER=apache-2.4
#HTTPD_SERVER=nginx-stable
#HTTPD_SERVER=apache-2.4
HTTPD_SERVER=nginx-stable
#HTTPD_SERVER=nginx-mainline
###