X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/24c13908a2cf5e4367899ad0af6b53cb294679e1..ad6090e461361094bb43d7171fea060e556b8f36:/Makefile

diff --git a/Makefile b/Makefile
index 54d8aa0aa0..0220adadc2 100644
--- a/Makefile
+++ b/Makefile
@@ -90,7 +90,7 @@ unit-tests-in-docker: workbench2-build-image check-arvados-directory
 	docker run -ti -v$(PWD):/usr/src/workbench2 -v$(ARVADOS_DIRECTORY):/usr/src/arvados -w /usr/src/workbench2 -e ARVADOS_DIRECTORY=/usr/src/arvados workbench2-build make unit-tests
 
 tests-in-docker: workbench2-build-image check-arvados-directory
-	docker run -ti -v$(PWD):/usr/src/workbench2 -v$(ARVADOS_DIRECTORY):/usr/src/arvados -w /usr/src/workbench2 -e ARVADOS_DIRECTORY=/usr/src/arvados workbench2-build make test
+	docker run -t -v$(PWD):/usr/src/workbench2 -v$(ARVADOS_DIRECTORY):/usr/src/arvados -w /usr/src/workbench2 -e ARVADOS_DIRECTORY=/usr/src/arvados -e ci="${ci}" workbench2-build make test
 
 test: unit-tests integration-tests
 
@@ -156,7 +156,7 @@ packages-in-docker: check-arvados-directory workbench2-build-image
 		-w="/tmp/workbench2" \
 		-t -v ${WORKSPACE}:/tmp/workbench2 \
 		-v ${ARVADOS_DIRECTORY}:/tmp/arvados workbench2-build:latest \
-		make packages
+		sh -c 'git config --global --add safe.directory /tmp/workbench2 && make packages'
 
 workbench2-build-image:
 	(cd docker && docker build -t workbench2-build .)