summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2019-02-05 13:59:10 +0000
committerMonty Taylor <mordred@inaugust.com>2019-02-05 14:32:58 +0000
commit73feab3b13caeee7ee4c01fa49a9c3d2c16f82e5 (patch)
tree964f7c96a9a5c27752fa25575d541739602f544c
parent3294e6e3e39a3c03ae0f817cc4256005c0e53b75 (diff)
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
Notes
Notes (review): Code-Review+2: James E. Blair <corvus@inaugust.com> Code-Review+2: Tobias Henkel <tobias.henkel@bmw.de> Workflow+1: Tobias Henkel <tobias.henkel@bmw.de> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 05 Feb 2019 18:46:41 +0000 Reviewed-on: https://review.openstack.org/634940 Project: openstack-infra/zuul Branch: refs/heads/master
-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 4031bf5..33e7e3d 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 1961ae6..a1806f3 100644
--- a/doc/source/admin/installation.rst
+++ b/doc/source/admin/installation.rst
@@ -335,7 +335,7 @@ Static External
335 deployments. 335 deployments.
336 336
337In order to serve the zuul dashboard code from an external static location, 337In 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.. code-block:: bash 340.. code-block:: bash
341 341
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