From 4f7dbd126f95e8099ccc78e3450598089faa9931 Mon Sep 17 00:00:00 2001
From: Vincent Letourneau <vincent@nanoninja.com>
Date: Sat, 29 Jul 2017 15:14:02 +0200
Subject: [PATCH] Update travis configuration

---
 .travis.yml        | 6 +++---
 Makefile           | 2 +-
 docker-compose.yml | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9f95981..91bd32c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,11 +16,11 @@ before_install:
 
 before_script:
   - make docker-start
-  - sleep 5m
+  - sleep 4m
   - docker inspect -f {{.Config.Volumes}} $(docker-compose ps -q php)
   - ls -lah
-  - ls -lah app
-  - ls -lah app/vendor/apigen/apigen
+  - ls -lah web/app
+  - ls -lah web/app/vendor/apigen/apigen
 
 script:
   - make travis
diff --git a/Makefile b/Makefile
index c0690e5..00e03c2 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ init:
 	@$(shell cp -n $(shell pwd)/web/app/composer.json.dist $(shell pwd)/web/app/composer.json 2> /dev/null)
 
 travis:
-	@docker exec $(shell docker-compose ps -q php) php -r 'echo getcwd(); var_dump(file_exists("app/vendor/apigen/apigen/bin/apigen"));'
+	@docker exec $(shell docker-compose ps -q php) php -r 'echo getcwd(); var_dump(file_exists("app/vendor/apigen/apigen/bin/apigen")); var_dump(file_exists("web/app/vendor/apigen/apigen/bin/apigen");'
 
 apidoc:
 	@docker exec $(shell docker-compose ps -q php) app/vendor/apigen/apigen/bin/apigen generate -s app/src -d app/doc
diff --git a/docker-compose.yml b/docker-compose.yml
index 5b2f283..729154b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
         ports:
             - "8000:80"
             - "3000:443"
-        restart: always     
+        restart: always
         volumes:
             - "./etc/nginx/default.conf:/etc/nginx/conf.d/default.conf"
             - "./etc/ssl:/etc/ssl"