From 9b19cc0cf752c5e0abf133af04637710b0cf5185 Mon Sep 17 00:00:00 2001 From: cytopia Date: Fri, 21 Apr 2017 21:15:31 +0200 Subject: [PATCH] DVL-005 changing service combinations --- .tests/test_single.sh | 4 ++-- README.md | 2 ++ env-example | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.tests/test_single.sh b/.tests/test_single.sh index 64188616..5dee605d 100755 --- a/.tests/test_single.sh +++ b/.tests/test_single.sh @@ -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" diff --git a/README.md b/README.md index ee3d0757..00bb0f6b 100644 --- a/README.md +++ b/README.md @@ -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) | | +**Incompatible choices:**
+- Apache 2.2 and HHVM do not work together **Optional NoSQL stack** diff --git a/env-example b/env-example index 1a36e1d8..39854bde 100644 --- a/env-example +++ b/env-example @@ -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 ###