X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9bd1a28a2f55eb435ff808cc118fe4f0b7f94c51..15073a5905fee439e6b3908d1e805050ff10936b:/Makefile

diff --git a/Makefile b/Makefile
index bb09fb2f34..6da3ed1062 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ VERSION?=$(shell ./version-at-commit.sh HEAD)
 # changes in the package. (i.e. example config files externally added
 ITERATION?=1
 
-TARGETS?="centos7 debian8 debian9 debian10 ubuntu1404 ubuntu1604 ubuntu1804"
+TARGETS?="centos7 debian8 debian10 ubuntu1404 ubuntu1604 ubuntu1804 ubuntu2004"
 
 DESCRIPTION=Arvados Workbench2 - Arvados is a free and open source platform for big data science.
 MAINTAINER=Arvados Package Maintainers <packaging@arvados.org>
@@ -33,7 +33,7 @@ RPM_FILE=$(APP_NAME)-$(VERSION)-$(ITERATION).x86_64.rpm
 
 export WORKSPACE?=$(shell pwd)
 
-.PHONY: help clean* yarn-install test build packages packages-with-version
+.PHONY: help clean* yarn-install test build packages packages-with-version integration-tests-in-docker
 
 help:
 	@echo >&2
@@ -67,9 +67,12 @@ integration-tests: yarn-install
 	yarn run cypress install
 	$(WORKSPACE)/tools/run-integration-tests.sh
 
+integration-tests-in-docker: workbench2-build-image
+	docker run -ti -v$(PWD):$(PWD) -w$(PWD) workbench2-build make integration-tests
+
 test: unit-tests integration-tests
 
-build: test
+build: yarn-install
 	VERSION=$(VERSION) yarn build
 
 $(DEB_FILE): build
@@ -118,4 +121,4 @@ copy: $(DEB_FILE) $(RPM_FILE)
 packages: copy
 
 workbench2-build-image:
-	docker build -t workbench2-build .
+	(cd docker && docker build -t workbench2-build .)