fix travis compose file; delete old example config

Erdiko · Nov 29, 2016 · 9fd5b98 · 9fd5b98
1 parent b573d70
commit 9fd5b98
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 26 deletions.
diff --git a/app/config/shared/database.example.json b/app/config/shared/database.example.json
diff --git a/docker-compose.travis.yml b/docker-compose.travis.yml
@@ -1,18 +1,14 @@
 version: '2'
 
 services:
-  webserver:
-    extends:
-      file: ./docker/nginx/docker-compose.yml
-      service: webserver
-  php:
-    extends:
-      file: ./docker/php/7.0/docker-compose.yml
-      service: php
   php71:
     extends:
       file: ./docker/php/7.1/docker-compose.yml
       service: php
+  php70:
+    extends:
+      file: ./docker/php/7.0/docker-compose.yml
+      service: php
   php56:
     extends:
       file: ./docker/php/5.6/docker-compose.yml
@@ -21,7 +17,7 @@ services:
     extends:
       file: ./docker/php/5.5/docker-compose.yml
       service: php
-  php55:
+  php54:
     extends:
       file: ./docker/php/5.4/docker-compose.yml
       service: php