From: Tom Clegg Date: Fri, 6 May 2022 13:49:13 +0000 (-0400) Subject: Merge branch '18947-keep-balance' X-Git-Tag: 2.5.0~185 X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/9171d310942ea3c8e3bed3e21a1c2d0604e93ad6?hp=d70eee2298afe8d082c72429a919bd94523c6bde Merge branch '18947-keep-balance' refs #18947 Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- diff --git a/services/api/app/views/static/intro.html.erb b/services/api/app/views/static/intro.html.erb index 8bab0b2ac6..3e0b40794e 100644 --- a/services/api/app/views/static/intro.html.erb +++ b/services/api/app/views/static/intro.html.erb @@ -8,7 +8,7 @@ $(function(){ }); <% end %>
- +

Welcome

ARVADOS

diff --git a/services/api/app/views/static/login_failure.html.erb b/services/api/app/views/static/login_failure.html.erb index 6b81a33e87..d3f7111b5b 100644 --- a/services/api/app/views/static/login_failure.html.erb +++ b/services/api/app/views/static/login_failure.html.erb @@ -10,7 +10,7 @@ $(function(){
- +

Error

diff --git a/tools/arvbox/lib/arvbox/docker/Dockerfile.demo b/tools/arvbox/lib/arvbox/docker/Dockerfile.demo index ffd8a8748f..98e6e6cf57 100644 --- a/tools/arvbox/lib/arvbox/docker/Dockerfile.demo +++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.demo @@ -4,14 +4,11 @@ FROM arvados/arvbox-base ARG arvados_version -ARG composer_version=arvados-fork ARG workbench2_version=main RUN cd /usr/src && \ git clone --no-checkout https://git.arvados.org/arvados.git && \ git -C arvados checkout ${arvados_version} && \ - git clone --no-checkout https://github.com/arvados/composer.git && \ - git -C composer checkout ${composer_version} && \ git clone --no-checkout https://git.arvados.org/arvados-workbench2.git workbench2 && \ git -C workbench2 checkout ${workbench2_version} && \ chown -R 1000:1000 /usr/src @@ -39,7 +36,6 @@ RUN echo fs.inotify.max_user_watches=524288 >> /etc/sysctl.conf 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/composer/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 diff --git a/tools/arvbox/lib/arvbox/docker/cluster-config.sh b/tools/arvbox/lib/arvbox/docker/cluster-config.sh index 2a286637f6..dfc9d1fece 100755 --- a/tools/arvbox/lib/arvbox/docker/cluster-config.sh +++ b/tools/arvbox/lib/arvbox/docker/cluster-config.sh @@ -106,8 +106,6 @@ Clusters: InternalURLs: "http://localhost:${services[keep-web]}/": {} ExternalURL: "https://$localip:${services[keep-web-dl-ssl]}/" - Composer: - ExternalURL: "https://$localip:${services[composer]}" Controller: ExternalURL: "https://$localip:${services[controller-ssl]}" InternalURLs: @@ -129,6 +127,8 @@ Clusters: BlobSigningKey: $blob_signing_key DefaultReplication: 1 TrustAllContent: true + Containers: + RuntimeEngine: singularity Login: Test: Enable: true diff --git a/tools/arvbox/lib/arvbox/docker/common.sh b/tools/arvbox/lib/arvbox/docker/common.sh index cb41227c9d..4e95bdedfc 100644 --- a/tools/arvbox/lib/arvbox/docker/common.sh +++ b/tools/arvbox/lib/arvbox/docker/common.sh @@ -37,7 +37,6 @@ services=( [api]=8004 [controller]=8003 [controller-ssl]=8000 - [composer]=4200 [arv-git-httpd-ssl]=9000 [arv-git-httpd]=9001 [keep-web]=9003 diff --git a/tools/arvbox/lib/arvbox/docker/service/composer/log/main/.gitstub b/tools/arvbox/lib/arvbox/docker/service/composer/log/main/.gitstub deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tools/arvbox/lib/arvbox/docker/service/composer/log/run b/tools/arvbox/lib/arvbox/docker/service/composer/log/run deleted file mode 120000 index d6aef4a77d..0000000000 --- a/tools/arvbox/lib/arvbox/docker/service/composer/log/run +++ /dev/null @@ -1 +0,0 @@ -/usr/local/lib/arvbox/logger \ No newline at end of file diff --git a/tools/arvbox/lib/arvbox/docker/service/composer/run b/tools/arvbox/lib/arvbox/docker/service/composer/run deleted file mode 100755 index 50a8ce1204..0000000000 --- a/tools/arvbox/lib/arvbox/docker/service/composer/run +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# Copyright (C) The Arvados Authors. All rights reserved. -# -# SPDX-License-Identifier: AGPL-3.0 - -set -e - -exec /usr/local/lib/arvbox/runsu.sh $0-service $1 diff --git a/tools/arvbox/lib/arvbox/docker/service/composer/run-service b/tools/arvbox/lib/arvbox/docker/service/composer/run-service deleted file mode 100755 index 4235bcd0c8..0000000000 --- a/tools/arvbox/lib/arvbox/docker/service/composer/run-service +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -# Copyright (C) The Arvados Authors. All rights reserved. -# -# SPDX-License-Identifier: AGPL-3.0 - -exec 2>&1 -set -ex -o pipefail - -. /usr/local/lib/arvbox/common.sh - -cd /usr/src/composer - -npm -d install --prefix /usr/local --global yarn@1.17.3 - -yarn install - -if test "$1" = "--only-deps" ; then - exit -fi - -cat >/usr/src/composer/src/composer.yml </dev/null if [[ $? -ne 0 ]]; then echo "Unable to find the IP_INT address '${IP_INT}' on the system, please correct the value in local.params. Exiting..." exit 1 @@ -302,7 +302,10 @@ else yum install -y curl git jq ;; "debian"|"ubuntu") - DEBIAN_FRONTEND=noninteractive apt update + # Wait 2 minutes for any apt locks to clear + # This option is supported from apt 1.9.1 and ignored in older apt versions. + # Cf. https://blog.sinjakli.co.uk/2021/10/25/waiting-for-apt-locks-without-the-hacky-bash-scripts/ + DEBIAN_FRONTEND=noninteractive apt -o DPkg::Lock::Timeout=120 update DEBIAN_FRONTEND=noninteractive apt install -y curl git jq ;; esac @@ -565,6 +568,7 @@ if [ -z "${ROLES}" ]; then echo " - arvados" >> ${S_DIR}/top.sls echo " - extra.shell_sudo_passwordless" >> ${S_DIR}/top.sls echo " - extra.shell_cron_add_login_sync" >> ${S_DIR}/top.sls + echo " - extra.passenger_rvm" >> ${S_DIR}/top.sls # Pillars echo " - docker" >> ${P_DIR}/top.sls @@ -657,6 +661,7 @@ else else echo " - nginx.passenger" >> ${S_DIR}/top.sls fi + echo " - extra.passenger_rvm" >> ${S_DIR}/top.sls ### If we don't install and run LE before arvados-api-server, it fails and breaks everything ### after it. So we add this here as we are, after all, sharing the host for api and controller if [ "${SSL_MODE}" = "lets-encrypt" ]; then