Merge branch 'master' into 15672-subprocess-list-v2

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas@di-pentima.com.ar>

diff --git a/Dockerfile b/Dockerfile
index 8f33282d7fd29a83fe826cce807df6ee9a3cd7a8..6f4fe7e16ae09cd799f54dcd4a95eb9ff270ee3d 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: AGPL-3.0
 
-FROM node:latest
+FROM node:8-buster
 MAINTAINER Ward Vandewege <ward@curoverse.com>
 RUN apt-get update
 RUN apt-get -q -y install libsecret-1-0 libsecret-1-dev rpm

diff --git a/Makefile b/Makefile
index 669fdda9f643b45e8b1dada54d60b98c61b60179..d90d8e81bad622a86a9bc3e61b8652c5c95960e2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,7 @@ RPM_FILE=$(APP_NAME)-$(VERSION)-$(ITERATION).x86_64.rpm
 
 export WORKSPACE?=$(shell pwd)
 
-.PHONY: help clean* yarn-install test build packages packages-with-version 
+.PHONY: help clean* yarn-install test build packages packages-with-version
 
 help:
        @echo >&2
@@ -106,7 +106,8 @@ $(RPM_FILE): build
         $(WORKSPACE)/build/=$(DEST_DIR)
 
 copy: $(DEB_FILE) $(RPM_FILE)
-       for target in $(TARGETS); do \
+       mkdir packages
+       for target in $^ ; do \
                if [[ $$target =~ ^centos ]]; then
                        cp -p $(RPM_FILE) packages/$$target ; \
                else

diff --git a/README.md b/README.md
index e2e14ce47e06f7fc5ddc67b1732419f60d071a07..8e720520aa4dec15d6ab089cd46b551d0235d794 100644 (file)
--- a/README.md
+++ b/README.md
@@ -26,6 +26,12 @@ yarn install
 yarn build
 </pre>
 
+### Package build
+<pre>
+docker build -t arvados/fpm .
+docker run -v$PWD:$PWD -w $PWD arvados/fpm make packages
+</pre>
+
 ### Build time configuration
 You can customize project global variables using env variables. Default values are placed in the `.env` file.
 
@@ -48,12 +54,12 @@ Currently this configuration schema is supported:
 
 #### API_HOST
 
-The Arvados base URL. 
+The Arvados base URL.
 
 The `REACT_APP_ARVADOS_API_HOST` environment variable can be used to set the default URL if the run time configuration is unreachable.
 
 #### VOCABULARY_URL
-Local path, or any URL that allows cross-origin requests. See 
+Local path, or any URL that allows cross-origin requests. See
 [Vocabulary JSON file example](public/vocabulary-example.json).
 
 To use the URL defined in the Arvados cluster configuration, remove the entire `VOCABULARY_URL` entry from the runtime configuration. Found in `/config.json` by default.

diff --git a/src/common/config.ts b/src/common/config.ts
index 7d974342a704198686b8e20a959e537c0e03a73c..4d4c1be7fc4dceb00ba8dcaa5b9ad0e6215682e5 100644 (file)
--- a/src/common/config.ts
+++ b/src/common/config.ts
@@ -38,6 +38,9 @@ export interface ClusterConfigJSON {
         }
         WebDAV: {
             ExternalURL: string
+        },
+        WebDAVDownload: {
+            ExternalURL: string
         }
     };
     Workbench: {
@@ -78,7 +81,7 @@ export const buildConfig = (clusterConfigJSON: ClusterConfigJSON): Config => {
     config.websocketUrl = clusterConfigJSON.Services.Websocket.ExternalURL;
     config.workbench2Url = clusterConfigJSON.Services.Workbench2.ExternalURL;
     config.workbenchUrl = clusterConfigJSON.Services.Workbench1.ExternalURL;
-    config.keepWebServiceUrl = clusterConfigJSON.Services.WebDAV.ExternalURL;
+    config.keepWebServiceUrl = clusterConfigJSON.Services.WebDAVDownload.ExternalURL;
     config.loginCluster = clusterConfigJSON.Login.LoginCluster;
     config.clusterConfig = clusterConfigJSON;
     mapRemoteHosts(clusterConfigJSON, config);
@@ -148,6 +151,7 @@ export const mockClusterConfigJSON = (config: Partial<ClusterConfigJSON>): Clust
         Workbench2: { ExternalURL: "" },
         Websocket: { ExternalURL: "" },
         WebDAV: { ExternalURL: "" },
+        WebDAVDownload: { ExternalURL: "" },
     },
     Workbench: {
         ArvadosDocsite: "",