From cdbd59836562bc1754ed85ce5518ebe356967480 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Fri, 17 Nov 2023 11:12:27 -0500 Subject: [PATCH] 20690: Remove workbench1 from arvbox. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- tools/arvbox/lib/arvbox/docker/Dockerfile.demo | 2 -- tools/arvbox/lib/arvbox/docker/Dockerfile.dev | 1 - tools/arvbox/lib/arvbox/docker/cluster-config.sh | 2 +- tools/arvbox/lib/arvbox/docker/common.sh | 3 +-- tools/arvbox/lib/arvbox/docker/service/ready/run-service | 1 - 5 files changed, 2 insertions(+), 7 deletions(-) diff --git a/tools/arvbox/lib/arvbox/docker/Dockerfile.demo b/tools/arvbox/lib/arvbox/docker/Dockerfile.demo index 98e6e6cf57..36b28ff9f6 100644 --- a/tools/arvbox/lib/arvbox/docker/Dockerfile.demo +++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.demo @@ -20,7 +20,6 @@ ADD service/ /var/lib/arvbox/service RUN ln -sf /var/lib/arvbox/service /etc RUN mkdir -p $ARVADOS_CONTAINER_PATH RUN echo "production" > $ARVADOS_CONTAINER_PATH/api_rails_env -RUN echo "production" > $ARVADOS_CONTAINER_PATH/workbench_rails_env # for the federation tests, the dev server watches a lot of files, # and we run three instances of the docker container. Bump up the @@ -38,7 +37,6 @@ RUN /usr/local/lib/arvbox/createusers.sh RUN sudo -u arvbox /var/lib/arvbox/service/api/run-service --only-deps RUN sudo -u arvbox /var/lib/arvbox/service/workbench2/run-service --only-deps RUN sudo -u arvbox /var/lib/arvbox/service/keep-web/run-service --only-deps -RUN sudo -u arvbox /var/lib/arvbox/service/workbench/run-service --only-deps RUN sudo -u arvbox /var/lib/arvbox/service/doc/run-service --only-deps RUN sudo -u arvbox /var/lib/arvbox/service/vm/run-service --only-deps RUN sudo -u arvbox /var/lib/arvbox/service/keepproxy/run-service --only-deps diff --git a/tools/arvbox/lib/arvbox/docker/Dockerfile.dev b/tools/arvbox/lib/arvbox/docker/Dockerfile.dev index e9c296a190..e3d18edd62 100644 --- a/tools/arvbox/lib/arvbox/docker/Dockerfile.dev +++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.dev @@ -9,7 +9,6 @@ ADD service/ /var/lib/arvbox/service RUN ln -sf /var/lib/arvbox/service /etc RUN mkdir -p $ARVADOS_CONTAINER_PATH RUN echo "development" > $ARVADOS_CONTAINER_PATH/api_rails_env -RUN echo "development" > $ARVADOS_CONTAINER_PATH/workbench_rails_env RUN mkdir /etc/test-service && \ ln -sf /var/lib/arvbox/service/postgres /etc/test-service && \ diff --git a/tools/arvbox/lib/arvbox/docker/cluster-config.sh b/tools/arvbox/lib/arvbox/docker/cluster-config.sh index 62aea092de..9b55181c91 100755 --- a/tools/arvbox/lib/arvbox/docker/cluster-config.sh +++ b/tools/arvbox/lib/arvbox/docker/cluster-config.sh @@ -72,7 +72,7 @@ Clusters: InternalURLs: "http://localhost:${services[api]}": {} Workbench1: - ExternalURL: "https://$localip:${services[workbench]}" + ExternalURL: "https://$localip:${services[workbench2-ssl]}" Workbench2: ExternalURL: "https://$localip:${services[workbench2-ssl]}" Keepproxy: diff --git a/tools/arvbox/lib/arvbox/docker/common.sh b/tools/arvbox/lib/arvbox/docker/common.sh index 822def937d..9b27e90009 100644 --- a/tools/arvbox/lib/arvbox/docker/common.sh +++ b/tools/arvbox/lib/arvbox/docker/common.sh @@ -35,7 +35,6 @@ server_cert_key=$ARVADOS_CONTAINER_PATH/server-cert-${localip}.key declare -A services services=( - [workbench]=3001 [workbench2]=3000 [workbench2-ssl]=443 [api]=8004 @@ -75,7 +74,7 @@ run_bundler() { fi BUNDLER=bundle if test -x $PWD/bin/bundle ; then - # If present, use the one associated with rails workbench or API + # If present, use the one associated with rails API BUNDLER=$PWD/bin/bundle fi diff --git a/tools/arvbox/lib/arvbox/docker/service/ready/run-service b/tools/arvbox/lib/arvbox/docker/service/ready/run-service index 6c104bf9b7..2ba955fb1e 100755 --- a/tools/arvbox/lib/arvbox/docker/service/ready/run-service +++ b/tools/arvbox/lib/arvbox/docker/service/ready/run-service @@ -84,7 +84,6 @@ fi echo echo "Your Arvados-in-a-box is ready!" -echo "Workbench is hosted at https://$localip:${services[workbench]}" echo "Workbench2 is hosted at https://$localip:${services[workbench2-ssl]}" echo "Documentation is hosted at http://$localip:${services[doc]}" -- 2.39.5