[ARVADOS-WORKBENCH2] updated: 1.4.2-1-gc02a4784
Git user
git at public.arvados.org
Sat Jan 4 20:20:40 UTC 2020
Summary of changes:
Dockerfile | 2 +-
Makefile | 5 +++--
README.md | 14 +++++++++++++-
3 files changed, 17 insertions(+), 4 deletions(-)
via c02a4784d437f30055785918828235eaebbd1010 (commit)
from 1c026909dca86d0526a17affbe55f22ebaefcd27 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
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
--
More information about the arvados-commits
mailing list