X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7b9b34fce607cd1785c2029f9b8dc316153f3d10..b774da617da87999f68863b90542dd41d9ba0bd3:/Makefile

diff --git a/Makefile b/Makefile
index 6a174bcf6c..c7a9cbfb8e 100644
--- a/Makefile
+++ b/Makefile
@@ -89,6 +89,9 @@ integration-tests-in-docker: workbench2-build-image check-arvados-directory
 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 -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
 
 build: yarn-install
@@ -148,12 +151,15 @@ packages-in-docker: check-arvados-directory workbench2-build-image
 	docker run --env ci="true" \
 		--env ARVADOS_DIRECTORY=/tmp/arvados \
 		--env APP_NAME=${APP_NAME} \
+		--env VERSION="${VERSION}" \
 		--env ITERATION=${ITERATION} \
 		--env TARGETS="${TARGETS}" \
+		--env MAINTAINER="${MAINTAINER}" \
+		--env DESCRIPTION="${DESCRIPTION}" \
 		-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 .)