From 8ab6a7986dae5a66e7addf1b79e9d751cd062d15 Mon Sep 17 00:00:00 2001 From: Justin Date: Mon, 14 May 2018 11:59:00 -0400 Subject: [PATCH] Updating docker.compose --- .travis.yml | 9 ++++++--- docker-compose.test.yml | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e92e18a2..eb8f0ca4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,10 +11,13 @@ cache: ## Spin up glitlab instance and sleep for 60 seconds before_script: - docker-compose -f docker-compose.test.yml up + ## Get the docker env variables - - SET PERSONAL_ACCESS_TOKEN = - - SET GITLAB_URL - - sleep 60 + - SET PERSONAL_ACCESS_TOKEN = docker exec -i gitlab echo PERSONAL_ACCESS_TOKEN + - SET GITLAB_URL = docker exec -i gitlab echo PERSONAL_ACCESS_TOKEN + + ## Sleep before performing commands on container + - sleep 10000 ## run tests script: diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 4cb11710..c0a60ff4 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -2,6 +2,7 @@ version: '3' services: gitlab: image: gitlab/gitlab-ce + container_name: gitlab entrypoint: docker-entrypoint.sh enviroment: - GITLAB_URL='http://localhost:8080'