diff --git a/.travis.yml b/.travis.yml index 7c880a3..61b69aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,17 +42,21 @@ install: # Disable services enabled by default # http://docs.travis-ci.com/user/database-setup/#MySQL - - sudo /etc/init.d/mysql stop || true - - sudo /etc/init.d/postgresql stop || true + - sudo /etc/init.d/httpd stop || true - sudo /etc/init.d/memcached stop || true - - sudo /etc/init.d/redis stop || true - sudo /etc/init.d/mongodb stop || true + - sudo /etc/init.d/mysql stop || true + - sudo /etc/init.d/nginx stop || true + - sudo /etc/init.d/postgresql stop || true + - sudo /etc/init.d/redis stop || true - - sudo service mysql stop || true - - sudo service postgresql stop || true + - sudo service httpd stop || true - sudo service memcached stop || true - - sudo service redis stop || true - sudo service mongodb stop || true + - sudo service mysql stop || true + - sudo service nginx stop || true + - sudo service postgresql stop || true + - sudo service redis stop || true - netstat -tulpn diff --git a/tests/base/04-test-run_nginx.sh b/tests/base/04-test-run_nginx.sh index 5dbd346..27e385e 100755 --- a/tests/base/04-test-run_nginx.sh +++ b/tests/base/04-test-run_nginx.sh @@ -22,7 +22,7 @@ FLAVOUR="${3}" ### ### Test Nginx with PHP-FPM ### -WWW_PORT="23254" +WWW_PORT="81" DOC_ROOT_HOST="$( mktemp -d )" DOC_ROOT_CONT="/var/www/default" @@ -65,9 +65,19 @@ ndid="$( docker_run "${CONTAINER}" "-v ${DOC_ROOT_HOST}:${DOC_ROOT_CONT} -v ${CO run "sleep 10" # Check PHP connectivity -if ! run "curl -q localhost:${WWW_PORT}/index.php 2>&1 | grep '${FINDME}'"; then +if ! run "curl -q http://localhost:${WWW_PORT}/index.php 2>&1 | grep '${FINDME}'"; then + # Show logs docker_logs "${ndid}" || true docker_logs "${did}" || true + + # Ensure file is available + docker_exec "${ndid}" "cat ${DOC_ROOT_CONT}/index.php" + docker_exec "${did}" "cat ${DOC_ROOT_CONT}/index.php" + + # Nginx configuration + docker_exec "${ndid}" "cat ${CONFIG_CONT}/php.conf" + + # Shutdown docker_stop "${ndid}" || true docker_stop "${did}" || true rm -rf "${DOC_ROOT_HOST}"