summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-02-05 18:46:41 +0000
committerGerrit Code Review <review@openstack.org>2019-02-05 18:46:41 +0000
commit59be0ac518880dd060d6a9d4b777c6e4de6e00fd (patch)
tree81a6b0420b4eb24bd50e37f09651efcd45cbd950
parent024537e4ecb40037da8cc17fcf83f6b85b902463 (diff)
parent73feab3b13caeee7ee4c01fa49a9c3d2c16f82e5 (diff)
Merge "Add react build env vars to Dockerfile"
-rw-r--r--Dockerfile5
-rw-r--r--doc/source/admin/installation.rst2
-rw-r--r--doc/source/developer/javascript.rst2
3 files changed, 7 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile
index 01f70f4..019ba42 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,6 +15,11 @@
15 15
16FROM opendevorg/python-builder as builder 16FROM opendevorg/python-builder as builder
17 17
18# Optional location of Zuul API endpoint.
19ARG REACT_APP_ZUUL_API
20# Optional flag to disable React Service Worker. (set to true to disable)
21ARG REACT_APP_DISABLE_SERVICE_WORKER
22
18COPY . /tmp/src 23COPY . /tmp/src
19RUN /tmp/src/tools/install-js-tools.sh 24RUN /tmp/src/tools/install-js-tools.sh
20RUN assemble 25RUN assemble
diff --git a/doc/source/admin/installation.rst b/doc/source/admin/installation.rst
index 6408b6d..900d2ff 100644
--- a/doc/source/admin/installation.rst
+++ b/doc/source/admin/installation.rst
@@ -338,7 +338,7 @@ Static External
338 deployments. 338 deployments.
339 339
340In order to serve the zuul dashboard code from an external static location, 340In order to serve the zuul dashboard code from an external static location,
341``REACT_APP_ZUUl_API`` must be set at javascript build time: 341``REACT_APP_ZUUL_API`` must be set at javascript build time:
342 342
343.. code-block:: bash 343.. code-block:: bash
344 344
diff --git a/doc/source/developer/javascript.rst b/doc/source/developer/javascript.rst
index 7a2c465..72b8865 100644
--- a/doc/source/developer/javascript.rst
+++ b/doc/source/developer/javascript.rst
@@ -156,7 +156,7 @@ api response needs to be set in the ``web/public/api`` directory.
156 curl -o public/api/${route} https://zuul.openstack.org/api/${route} 156 curl -o public/api/${route} https://zuul.openstack.org/api/${route}
157 done 157 done
158 158
159To use an existing zuul api, uses the REACT_APP_ZUUl_API environment 159To use an existing zuul api, uses the REACT_APP_ZUUL_API environment
160variable: 160variable:
161 161
162.. code-block:: bash 162.. code-block:: bash