[ARVADOS-WORKBENCH2] created: 1.4.2-4-g1952e4d9

[Git user]

        at  1952e4d960e845cbacb9a5d825a903e2112ab1ad (commit)


commit 1952e4d960e845cbacb9a5d825a903e2112ab1ad
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Sat Jan 4 16:52:35 2020 -0500

    Should be $(TARGETS)
    
    no issue #
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/Makefile b/Makefile
index b81afda7..e70d8ad3 100644
--- a/Makefile
+++ b/Makefile
@@ -108,7 +108,7 @@ $(RPM_FILE): build
 	 $(WORKSPACE)/build/=$(DEST_DIR)
 
 copy: $(DEB_FILE) $(RPM_FILE)
-	for target in $TARGETS ; do \
+	for target in $(TARGETS) ; do \
 	        mkdir -p packages/$$target
 		if [[ $$target =~ ^centos ]]; then
 			cp -p $(RPM_FILE) packages/$$target ; \

commit 1dabae1bef7c290699c59004248fc3bc8f52c53d
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Sat Jan 4 16:46:20 2020 -0500

    Fix packaging again
    
    no issue #
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/Makefile b/Makefile
index 96021d1f..b81afda7 100644
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,8 @@ VERSION?=$(GIT_TAG).$(DATE_FROM_TS_GIT)
 # changes in the package. (i.e. example config files externally added
 ITERATION?=1
 
+TARGETS?="centos7 debian8 debian9 debian10 ubuntu1404 ubuntu1604 ubuntu1804"
+
 DESCRIPTION=Arvados Workbench2 - Arvados is a free and open source platform for big data science.
 MAINTAINER=Ward Vandewege <wvandewege at veritasgenetics.com>
 
@@ -106,12 +108,12 @@ $(RPM_FILE): build
 	 $(WORKSPACE)/build/=$(DEST_DIR)
 
 copy: $(DEB_FILE) $(RPM_FILE)
-	for target in $^ ; do
+	for target in $TARGETS ; do \
 	        mkdir -p packages/$$target
 		if [[ $$target =~ ^centos ]]; then
-			cp -p $(RPM_FILE) packages/$$target
+			cp -p $(RPM_FILE) packages/$$target ; \
 		else
-			cp -p $(DEB_FILE) packages/$$target
+			cp -p $(DEB_FILE) packages/$$target ; \
 		fi
 	done
 	rm -f $(RPM_FILE)

commit 2362d491dfaafefcfb702a53279eb131d8c95650
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Sat Jan 4 16:34:41 2020 -0500

    Fix package build again
    
    no issue #
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/Makefile b/Makefile
index d90d8e81..96021d1f 100644
--- a/Makefile
+++ b/Makefile
@@ -106,12 +106,12 @@ $(RPM_FILE): build
 	 $(WORKSPACE)/build/=$(DEST_DIR)
 
 copy: $(DEB_FILE) $(RPM_FILE)
-	mkdir packages
-	for target in $^ ; do \
+	for target in $^ ; do
+	        mkdir -p packages/$$target
 		if [[ $$target =~ ^centos ]]; then
-			cp -p $(RPM_FILE) packages/$$target ; \
+			cp -p $(RPM_FILE) packages/$$target
 		else
-			cp -p $(DEB_FILE) packages/$$target ; \
+			cp -p $(DEB_FILE) packages/$$target
 		fi
 	done
 	rm -f $(RPM_FILE)

commit c02a4784d437f30055785918828235eaebbd1010
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Wed Dec 18 14:21:23 2019 -0500

    Update package build
    
    no issue #
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/Dockerfile b/Dockerfile
index 8f33282d..6f4fe7e1 100644
--- 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 at 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 669fdda9..d90d8e81 100644
--- 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 425d1787..4ca82b62 100644
--- 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.
 
@@ -46,8 +52,14 @@ Currently this configuration schema is supported:
 }
 ```
 
+#### API_HOST
+
+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).
 
 ### FILE_VIEWERS_CONFIG_URL

-----------------------------------------------------------------------


hooks/post-receive
--