From 1facbe1b9a0f41f7a86e9cae8a78926364ed69f6 Mon Sep 17 00:00:00 2001 From: Brett Smith Date: Fri, 29 Dec 2023 12:09:01 -0500 Subject: [PATCH] 20846/20690: Remove Workbench1 build in debian12/ubuntu2204 This applies the change from c7cf228372bee18d84b14fc4089a758bc157fe76 to the debian12 and ubuntu2204 package build Dockerfiles. Refs #20690, #20846. These branches were in development in parallel, so the changes from the former weren't applied to the latter. Arvados-DCO-1.1-Signed-off-by: Brett Smith --- build/package-build-dockerfiles/debian12/Dockerfile | 2 -- build/package-build-dockerfiles/ubuntu2204/Dockerfile | 2 -- 2 files changed, 4 deletions(-) diff --git a/build/package-build-dockerfiles/debian12/Dockerfile b/build/package-build-dockerfiles/debian12/Dockerfile index 8e9f6c0d45..859c1a8597 100644 --- a/build/package-build-dockerfiles/debian12/Dockerfile +++ b/build/package-build-dockerfiles/debian12/Dockerfile @@ -70,8 +70,6 @@ RUN git clone git://git.arvados.org/arvados.git /tmp/arvados && \ if [[ -n "${BRANCH}" ]]; then git checkout ${BRANCH}; fi && \ cd /tmp/arvados/services/api && \ /usr/local/rvm/bin/rvm-exec default bundle install && \ - cd /tmp/arvados/apps/workbench && \ - /usr/local/rvm/bin/rvm-exec default bundle install && \ cd /tmp/arvados && \ go mod download diff --git a/build/package-build-dockerfiles/ubuntu2204/Dockerfile b/build/package-build-dockerfiles/ubuntu2204/Dockerfile index 741697e1ea..533cdd8641 100644 --- a/build/package-build-dockerfiles/ubuntu2204/Dockerfile +++ b/build/package-build-dockerfiles/ubuntu2204/Dockerfile @@ -73,8 +73,6 @@ RUN git clone git://git.arvados.org/arvados.git /tmp/arvados && \ if [[ -n "${BRANCH}" ]]; then git checkout ${BRANCH}; fi && \ cd /tmp/arvados/services/api && \ /usr/local/rvm/bin/rvm-exec default bundle install && \ - cd /tmp/arvados/apps/workbench && \ - /usr/local/rvm/bin/rvm-exec default bundle install && \ cd /tmp/arvados && \ go mod download -- 2.39.5