diff --git a/.travis.yml b/.travis.yml index a6dc276..55a37d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,12 +13,16 @@ before_install: - chmod +x docker-compose - sudo mv docker-compose /usr/local/bin - docker-compose --version - - make init before_script: - make docker-start - - sleep 1m + - sleep 30s script: - make apidoc - - make test \ No newline at end of file + - make test + - make gen-certs + - make mysql-dump + +before_script: + - make docker-stop \ No newline at end of file diff --git a/Makefile b/Makefile index 0d96da6..ff11183 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,7 @@ clean: composer-up: @docker run --rm -v $(shell pwd)/web/app:/app composer/composer update -docker-start: +docker-start: init @echo "Docker is running..." docker-compose up -d diff --git a/README.md b/README.md index 37760d0..a0ca57c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Nginx PHP MySQL +# Nginx PHP MySQL [![Build Status](https://travis-ci.org/nanoninja/docker-nginx-php-mysql.svg?branch=master)](https://travis-ci.org/nanoninja/docker-nginx-php-mysql) Docker running Nginx, PHP-FPM, Composer, MySQL and PHPMyAdmin.