zuul
/
zuul
Code Issues Proposed changes

Merge "Add react build env vars to Dockerfile"

This commit is contained in:
Zuul 2019-02-05 18:46:41 +00:00 committed by Gerrit Code Review
parent 024537e4ec 73feab3b13
commit 59be0ac518
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Dockerfile
View File

@ -15,6 +15,11 @@
FROM opendevorg/python-builder as builder FROM opendevorg/python-builder as builder
# Optional location of Zuul API endpoint.
ARG REACT_APP_ZUUL_API
# Optional flag to disable React Service Worker. (set to true to disable)
ARG REACT_APP_DISABLE_SERVICE_WORKER
COPY . /tmp/src COPY . /tmp/src
RUN /tmp/src/tools/install-js-tools.sh RUN /tmp/src/tools/install-js-tools.sh
RUN assemble RUN assemble

2
doc/source/admin/installation.rst
View File

@ -338,7 +338,7 @@ Static External
deployments. deployments.
In order to serve the zuul dashboard code from an external static location, In order to serve the zuul dashboard code from an external static location,
``REACT_APP_ZUUl_API`` must be set at javascript build time: ``REACT_APP_ZUUL_API`` must be set at javascript build time:
.. code-block:: bash .. code-block:: bash

2
doc/source/developer/javascript.rst
View File

@ -156,7 +156,7 @@ api response needs to be set in the ``web/public/api`` directory.
curl -o public/api/${route} https://zuul.openstack.org/api/${route} curl -o public/api/${route} https://zuul.openstack.org/api/${route}
done done
To use an existing zuul api, uses the REACT_APP_ZUUl_API environment To use an existing zuul api, uses the REACT_APP_ZUUL_API environment
variable: variable:
.. code-block:: bash .. code-block:: bash