From b663f5c6770040e612bb9a9dce3d28973747c369 Mon Sep 17 00:00:00 2001 From: Lucas Di Pentima Date: Tue, 20 Feb 2024 16:12:37 -0300 Subject: [PATCH] 21461: Improves dev QoL on testing & building new WB2 docker images. Instead of always check out the arvados repository from the git server, pass it as a build context, so changes in dev branches can easily be iterated on. Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- services/workbench2/Makefile | 2 +- services/workbench2/docker/Dockerfile | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/services/workbench2/Makefile b/services/workbench2/Makefile index 18da156f4d..00efa38fc9 100644 --- a/services/workbench2/Makefile +++ b/services/workbench2/Makefile @@ -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} diff --git a/services/workbench2/docker/Dockerfile b/services/workbench2/docker/Dockerfile index e54496f35b..fa4266191a 100644 --- a/services/workbench2/docker/Dockerfile +++ b/services/workbench2/docker/Dockerfile @@ -13,8 +13,11 @@ RUN apt-get update && \ apt-get clean RUN /usr/bin/gem install --no-document fpm -RUN cd /usr/src && git clone git://git.arvados.org/arvados.git && \ - cd arvados && \ +WORKDIR /usr/src/arvados +COPY . . +RUN cd /usr/src/arvados && \ + test -d cmd/arvados-server || \ + (echo "ERROR: build context must be an Arvados repository" && false) && \ GO_VERSION=$(grep 'goversion =' lib/install/deps.go |awk -F'"' '{print $2}') && \ ARCH=$(dpkg --print-architecture) && \ echo $GO_VERSION && \ -- 2.30.2