[ARVADOS] created: 2.1.0-1767-g021ca12b2
Git user
git at public.arvados.org
Fri Dec 24 20:57:32 UTC 2021
at 021ca12b276fa9dd9a7687c43c1485ff9474b0bd (commit)
commit 021ca12b276fa9dd9a7687c43c1485ff9474b0bd
Author: Ward Vandewege <ward at curii.com>
Date: Fri Dec 24 15:57:07 2021 -0500
17417: we really need a javascript runtime for wb1.
Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>
diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile
index 8005cb321..bc08b2ded 100644
--- a/apps/workbench/Gemfile
+++ b/apps/workbench/Gemfile
@@ -32,6 +32,7 @@ group :assets do
gem 'uglifier', '~> 2.0'
# See https://github.com/rails/execjs#readme for more supported runtimes
+ gem 'mini_racer', :platforms => :ruby
end
group :development, :test, :performance do
diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index 12e14518e..f9575ac50 100644
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -151,6 +151,7 @@ GEM
jwt (1.5.6)
launchy (2.4.3)
addressable (~> 2.3)
+ libv8-node (15.14.0.1)
lograge (0.10.0)
actionpack (>= 4)
activesupport (>= 4)
@@ -171,6 +172,8 @@ GEM
mime-types-data (3.2019.0331)
mini_mime (1.1.0)
mini_portile2 (2.6.1)
+ mini_racer (0.4.0)
+ libv8-node (~> 15.14.0.0)
minitest (5.10.3)
mocha (1.8.0)
metaclass (~> 0.0.1)
@@ -333,6 +336,7 @@ DEPENDENCIES
lograge
logstash-event
mime-types
+ mini_racer
minitest (~> 5.10.3)
mocha
morrisjs-rails
commit af62d78f8d288dc61992575c01f0484debb7694f
Author: Ward Vandewege <ward at curii.com>
Date: Fri Dec 24 15:56:26 2021 -0500
17417: make sure that there is enough of a config.yml file for the wb1
package install test to find all potential issues.
Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>
diff --git a/build/package-testing/common-test-rails-server-package.sh b/build/package-testing/common-test-rails-server-package.sh
index 6a7097c34..33167f049 100755
--- a/build/package-testing/common-test-rails-server-package.sh
+++ b/build/package-testing/common-test-rails-server-package.sh
@@ -12,6 +12,30 @@ else
PACKAGE_NAME=$1; shift
fi
+if [ "$PACKAGE_NAME" = "arvados-workbench" ]; then
+ mkdir -p /etc/arvados
+ cat <<'EOF' >/etc/arvados/config.yml
+---
+Clusters:
+ xxxxx:
+ Services:
+ Workbench1:
+ ExternalURL: "https://workbench.xxxxx.example.com"
+ WebDAV:
+ ExternalURL: https://*.collections.xxxxx.example.com/
+ WebDAVDownload:
+ ExternalURL: https://download.xxxxx.example.com
+ ManagementToken: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ SystemRootToken: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ Collections:
+ BlobSigningKey: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ Workbench:
+ SecretKeyBase: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ Users:
+ AutoAdminFirstUser: true
+EOF
+fi
+
cd "/var/www/${PACKAGE_NAME%-server}/current"
case "$TARGET" in
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list