From d4e2911903af2b94c33003d355bf9dddfdd6412b Mon Sep 17 00:00:00 2001
From: Justin <justin.s.dalrymple@gmail.com>
Date: Sun, 20 May 2018 11:16:03 -0400
Subject: [PATCH] Finished local testing

---
 .travis.yml                         | 11 +++++------
 test/docker/docker-compose.test.yml |  3 +++
 test/docker/docker-entrypoint       |  5 ++++-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3796a6f0..2c611c51 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,17 +12,16 @@ cache:
 before_script:
   ## Spin up container
   - cd test/docker/
-  - docker-compose -f docker-compose.test.yml up -d
+  - docker-compose -f docker-compose.test.yml up
 
-  - docker exec -i gitlab printenv
   ## Get the docker env variables
-  - PERSONAL_ACCESS_TOKEN=$(docker exec -i gitlab printenv)
-  - GITLAB_URL=$(docker exec -i gitlab echo $GITLAB_URL)
-  - echo $PERSONAL_ACCESS_TOKEN
-  - echo $GITLAB_URL
+  - export PERSONAL_ACCESS_TOKEN=$(docker exec -i gitlab printenv)
+  - export GITLAB_URL=$(docker exec -i gitlab echo $GITLAB_URL)
+
   ## Sleep before performing commands on container
   - sleep 30
 
+  - env
 ## run tests
 script:
   - npm run test
diff --git a/test/docker/docker-compose.test.yml b/test/docker/docker-compose.test.yml
index 366998fc..06c59b74 100644
--- a/test/docker/docker-compose.test.yml
+++ b/test/docker/docker-compose.test.yml
@@ -4,6 +4,9 @@ services:
     image: gitlab/gitlab-ce
     container_name: gitlab
     entrypoint: init/docker-entrypoint
+    environment:
+      - EXTERNAL_PORT=8080
+      - PERSONAL_ACCESS_TOKEN
     ports: 
       - 8080:80
       - 8443:443
diff --git a/test/docker/docker-entrypoint b/test/docker/docker-entrypoint
index abb87767..e570c1d7 100755
--- a/test/docker/docker-entrypoint
+++ b/test/docker/docker-entrypoint
@@ -7,7 +7,10 @@ echo Sleep for 30 seconds to ensure all services are running
 sleep 30
 
 echo Initalize test token and user
-export PERSONAL_ACCESS_TOKEN="$(gitlab-rails r /init/test.rb)"
+PERSONAL_ACCESS_TOKEN="$(gitlab-rails r /init/test.rb)"
+
+echo "export PERSONAL_ACCESS_TOKEN=$PERSONAL_ACCESS_TOKEN" >> ~/.bashrc
+echo "export GITLAB_URL=http://localhost:$EXTERNAL_PORT" >> ~/.bashrc
 
 echo Tail and wait
 gitlab-ctl tail&