From 91b900db3b89b6e0ed4f37758daa630bf940dff0 Mon Sep 17 00:00:00 2001 From: Bobby Rullo Date: Thu, 20 Aug 2015 16:50:30 -0700 Subject: [PATCH] go-docker: support functional tests * add linking to go-docker command and remove host networking * add functional/repo to functional tests script --- go-docker | 7 ++++++- test-functional | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/go-docker b/go-docker index f22ddf56..84699a6a 100755 --- a/go-docker +++ b/go-docker @@ -17,5 +17,10 @@ for VAR in ${DOCKER_ENV//,/ }; do ENV_STR="$ENV_STR -e $VAR=${!VAR}" done +LINKS_STR="" +for VAR in ${DOCKER_LINKS//,/ }; do + LINKS_STR="$LINKS_STR --link $VAR" +done + echo "running with docker, might take a while to pull the image..." -docker run $ENV_STR --rm --net=host -v `pwd`:/go/src/$REPO -w /go/src/$REPO quay.io/coreos/go-builder:1.3.3 $@ +docker run $LINKS_STR $ENV_STR --rm -v `pwd`:/go/src/$REPO -w /go/src/$REPO quay.io/coreos/go-builder:1.3.3 $@ diff --git a/test-functional b/test-functional index 92c8d8dd..42f3e0d3 100755 --- a/test-functional +++ b/test-functional @@ -1,4 +1,4 @@ #!/bin/bash -e - source ./build go test $@ github.com/coreos/dex/functional +go test $@ github.com/coreos/dex/functional/repo