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 <brett.smith@curii.com>

diff --git a/build/package-build-dockerfiles/debian12/Dockerfile b/build/package-build-dockerfiles/debian12/Dockerfile
index 8e9f6c0d451d119d13088bf0d4b49f4d13143d05..859c1a8597dcc52b8670b79bb4a7b17a39cdb473 100644 (file)
--- 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 741697e1ea4d7a432f452bedc9d5db0ac28797f7..533cdd8641886d381d312cc4f4f09d598e62fd88 100644 (file)
--- 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