X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/92308b1b044dee2970c4409a0da660ccbecce945..cb690390d4f253c3bbb9c543e243cf988f39fbb3:/services/workbench2/Makefile

diff --git a/services/workbench2/Makefile b/services/workbench2/Makefile
index d621eb3e2f..0d402a63c1 100644
--- a/services/workbench2/Makefile
+++ b/services/workbench2/Makefile
@@ -23,8 +23,6 @@ ITERATION?=1
 
 TARGETS?=centos7 rocky8 debian10 debian11 ubuntu1804 ubuntu2004
 
-ARVADOS_DIRECTORY?=unset
-
 DESCRIPTION=Arvados Workbench2 - Arvados is a free and open source platform for big data science.
 MAINTAINER=Arvados Package Maintainers <packaging@arvados.org>
 
@@ -37,8 +35,11 @@ DEB_FILE=$(APP_NAME)_$(VERSION)-$(ITERATION)_amd64.deb
 # redHat package file
 RPM_FILE=$(APP_NAME)-$(VERSION)-$(ITERATION).x86_64.rpm
 
+GOPATH=$(shell go env GOPATH)
 export WORKSPACE?=$(shell pwd)
 
+ARVADOS_DIRECTORY?=$(shell env -C $(WORKSPACE) git rev-parse --show-toplevel)
+
 .PHONY: help clean* yarn-install test build packages packages-with-version integration-tests-in-docker
 
 help:
@@ -67,7 +68,8 @@ arvados-server-install: check-arvados-directory
 	cd $(ARVADOS_DIRECTORY)
 	go mod download
 	cd cmd/arvados-server
-	go install
+	echo GOPATH is $(GOPATH)
+	GOFLAGS=-buildvcs=false go install
 	cd -
 	ls -l $(GOPATH)/bin/arvados-server
 	$(GOPATH)/bin/arvados-server install -type test
@@ -83,10 +85,35 @@ integration-tests: yarn-install check-arvados-directory
 	$(WORKSPACE)/tools/run-integration-tests.sh -a $(ARVADOS_DIRECTORY)
 
 integration-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 arvados-server-install integration-tests
+	docker run -ti --rm \
+		--env ARVADOS_DIRECTORY=/usr/src/arvados \
+		--env GIT_DISCOVERY_ACROSS_FILESYSTEM=1 \
+		-v $(WORKSPACE):/usr/src/arvados/services/workbench2 \
+		-v $(ARVADOS_DIRECTORY):/usr/src/arvados \
+		-w /usr/src/arvados/services/workbench2 \
+		workbench2-build \
+		make arvados-server-install integration-tests
 
 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 arvados-server-install unit-tests
+	docker run -ti --rm \
+		--env ARVADOS_DIRECTORY=/usr/src/arvados \
+		--env GIT_DISCOVERY_ACROSS_FILESYSTEM=1 \
+		-v $(WORKSPACE):/usr/src/arvados/services/workbench2 \
+		-v $(ARVADOS_DIRECTORY):/usr/src/arvados \
+		-w /usr/src/arvados/services/workbench2 \
+		workbench2-build \
+		make arvados-server-install unit-tests
+
+tests-in-docker: workbench2-build-image check-arvados-directory
+	docker run -ti --rm \
+		--env ARVADOS_DIRECTORY=/usr/src/arvados \
+		--env GIT_DISCOVERY_ACROSS_FILESYSTEM=1 \
+		--env ci="${ci}" \
+		-v $(WORKSPACE):/usr/src/arvados/services/workbench2 \
+		-v$(ARVADOS_DIRECTORY):/usr/src/arvados \
+		-w /usr/src/arvados/services/workbench2 \
+		workbench2-build \
+		make test
 
 test: unit-tests integration-tests
 
@@ -144,15 +171,20 @@ check-arvados-directory:
 	@if ! test -d "${ARVADOS_DIRECTORY}"; then echo "the environment variable ARVADOS_DIRECTORY does not point at a directory"; exit 1; fi
 
 packages-in-docker: check-arvados-directory workbench2-build-image
-	docker run --env ci="true" \
+	docker run -t --rm --env ci="true" \
 		--env ARVADOS_DIRECTORY=/tmp/arvados \
 		--env APP_NAME=${APP_NAME} \
+		--env VERSION="${VERSION}" \
 		--env ITERATION=${ITERATION} \
 		--env TARGETS="${TARGETS}" \
-		-w="/tmp/workbench2" \
-		-t -v ${WORKSPACE}:/tmp/workbench2 \
-		-v ${ARVADOS_DIRECTORY}:/tmp/arvados workbench2-build:latest \
-		make packages
+		--env MAINTAINER="${MAINTAINER}" \
+		--env DESCRIPTION="${DESCRIPTION}" \
+		--env GIT_DISCOVERY_ACROSS_FILESYSTEM=1 \
+		-w "/tmp/workbench2" \
+		-v ${WORKSPACE}:/tmp/workbench2 \
+		-v ${ARVADOS_DIRECTORY}:/tmp/arvados \
+		workbench2-build:latest \
+		sh -c 'git config --global --add safe.directory /tmp/workbench2 && make packages'
 
 workbench2-build-image:
 	(cd docker && docker build -t workbench2-build .)