Update travis configuration

This commit is contained in:
Vincent Letourneau
2017-07-29 15:51:04 +02:00
parent 77738aae13
commit 5c04235514
3 changed files with 9 additions and 5 deletions

View File

@@ -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
- make test
- make gen-certs
- make mysql-dump
before_script:
- make docker-stop

View File

@@ -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

View File

@@ -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.