21461: Improves dev QoL on testing & building new WB2 docker images.

[arvados.git] / services / workbench2 / Makefile

diff --git a/services/workbench2/Makefile b/services/workbench2/Makefile
index 0d402a63c14465417727843f9239d395c3a8787b..00efa38fc9ef3c146ee70377dc32ee01ee7c5605 100644 (file)
--- a/services/workbench2/Makefile
+++ b/services/workbench2/Makefile
@@ -21,7 +21,7 @@ GIT_COMMIT?=$(shell git rev-parse --short HEAD)
 # changes in the package. (i.e. example config files externally added
 ITERATION?=1
 
-TARGETS?=centos7 rocky8 debian10 debian11 ubuntu1804 ubuntu2004
+TARGETS?=rocky8 debian11 debian12 ubuntu2004 ubuntu2204
 
 DESCRIPTION=Arvados Workbench2 - Arvados is a free and open source platform for big data science.
 MAINTAINER=Arvados Package Maintainers <packaging@arvados.org>
@@ -187,4 +187,4 @@ packages-in-docker: check-arvados-directory workbench2-build-image
                sh -c 'git config --global --add safe.directory /tmp/workbench2 && make packages'
 
 workbench2-build-image:
-       (cd docker && docker build -t workbench2-build .)
+       docker build -t workbench2-build -f docker/Dockerfile ${ARVADOS_DIRECTORY}