Browse Source

Add react build env vars to Dockerfile

So that people can re-use the Dockerfiles to build zuul images
but with different flags set, plumb the env vars through here
as ARG entries.

Also, fix 2 doc references that were misspelled.

Change-Id: I320a496eadf4132fc0583dd48a87024a2ff61a07
tags/3.6.0
Monty Taylor 5 months ago
parent
commit
73feab3b13
3 changed files with 7 additions and 2 deletions
  1. 5
    0
      Dockerfile
  2. 1
    1
      doc/source/admin/installation.rst
  3. 1
    1
      doc/source/developer/javascript.rst

+ 5
- 0
Dockerfile View File

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

+ 1
- 1
doc/source/admin/installation.rst View File

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

+ 1
- 1
doc/source/developer/javascript.rst View File

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

Loading…
Cancel
Save