From 4b5e21919cdea08d6509bc4c25723ca5b3231753 Mon Sep 17 00:00:00 2001
From: "Aeneas Rekkas (arekkas)" <aeneas@ory.am>
Date: Sat, 6 May 2017 22:37:39 +0200
Subject: [PATCH] ci: resolve travis issues

---
 .travis.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bf81e44485..24edb0a60d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,7 @@ services:
   - docker
 
 env:
-  - DOCKER_BIND_LOCALHOST=true GO15VENDOREXPERIMENT=1
-  - DATABASE_URL=memory
+  - DOCKER_BIND_LOCALHOST=true DATABASE_URL=memory
 
 language: go
 
@@ -33,7 +32,7 @@ script:
   - go test -v -bench=.* -run=none $(glide novendor)
   - docker build -t hydra-travis-ci .
   - docker run -d hydra-travis-ci
-  - hydra host --dangerous-auto-logon --dangerous-force-http &
+  - DATABASE_URL=memory hydra host --dangerous-auto-logon --dangerous-force-http &
   - while ! echo exit | nc localhost 4444; do sleep 1; done
 # Test clients
   - hydra clients create --id foobar