diff --git a/Makefile b/Makefile index dc632f348..3eda1cc5c 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,7 @@ docker-test-run-with-postgres: ci-docker-test-run-with-sqlite3: cd ${CURDIR}/test/fn-api-tests/ && docker build -t funcy/fn-api-tester .; cd ${CURDIR} - docker run --rm -i -v ${CURDIR}:/go/src/gitlab-odx.oracle.com/odx/functions -w /go/src/gitlab-odx.oracle.com/odx/functions -e "datastore=sqlite3" funcy/fn-api-tester + docker run --rm -i -v ${CURDIR}:/go/src/gitlab-odx.oracle.com/odx/functions -w /go/src/gitlab-odx.oracle.com/odx/functions -e "datastore=sqlite3" -e "DOCKER_HOST=${DOCKERHOST}" funcy/fn-api-tester docker-test: docker run -ti --privileged --rm -e LOG_LEVEL=debug \ diff --git a/api_test.sh b/api_test.sh index fb02913ad..a7f6ca31d 100755 --- a/api_test.sh +++ b/api_test.sh @@ -15,7 +15,7 @@ case "$1" in docker rm -fv func-server || echo No prev func-server container docker run --name func-mysql-test -p 3306:3306 -e MYSQL_DATABASE=funcs -e MYSQL_ROOT_PASSWORD=root -d mysql - sleep 8 + sleep 20 export MYSQL_HOST="$(docker inspect -f '{{.NetworkSettings.IPAddress}}' func-mysql-test)" export MYSQL_PORT=3306 docker run --name func-server --privileged -d -e NO_PROXY -e HTTP_PROXY -e DOCKER_HOST=${DOCKER_HOST} -e LOG_LEVEL=debug -e "DB_URL=mysql://root:root@tcp(${MYSQL_HOST}:${MYSQL_PORT})/funcs" -p 8080:8080 -v /var/run/docker.sock:/var/run/docker.sock funcy/functions