X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/9bd1a28a2f55eb435ff808cc118fe4f0b7f94c51..fec738a21a4107bf60c3bcff7d274697833e01dd:/Makefile?ds=sidebyside diff --git a/Makefile b/Makefile index bb09fb2f..4a8854c3 100644 --- a/Makefile +++ b/Makefile @@ -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,6 +67,9 @@ 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 @@ -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 .)