diff options
| author | Tobias Henkel <tobias.henkel@bmw.de> | 2019-06-04 19:44:09 +0200 |
|---|---|---|
| committer | Tobias Henkel <tobias.henkel@bmw.de> | 2020-07-07 19:53:33 +0200 |
| commit | b6f3167b9c4d219daddf6a86ab4df9a8eed4bec8 (patch) | |
| tree | 4d0e8e15eb1e9cf2fba3023f594d590bc5f6e518 /Dockerfile | |
| parent | c04a8b19837961a17cfda44609d17eac0f3c2c8a (diff) | |
| download | zuul-b6f3167b9c4d219daddf6a86ab4df9a8eed4bec8.tar.gz | |
Revert "Revert "Create zuul/web/static on demand""
The js content tarball creation was broken. Instead of leaving the
symlink to a non-existing directory which gets created during python
setup we should just remove that symlink as well and create the
symlink and the static dir during the python setup. This way nothing
will be in the way of the javascript content generation.
This reverts commit eb7b18b38e01688b5b05e5dfdb359ff5d42d1ed8.
Change-Id: I5f8bfa62cd2d4d9823b86dbcda14885230847a82
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile index e1a30d5b3..c67e93d52 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,12 @@ ARG OPENSHIFT_SHA=4b0f07428ba854174c58d2e38287e5402964c9a9355f6c359d1242efd0990d COPY . /tmp/src RUN /tmp/src/tools/install-js-tools.sh # Explicitly run the Javascript build -RUN cd /tmp/src/web && yarn install -d && yarn build +RUN cd /tmp/src \ + && mkdir -p zuul/web/static \ + && ln -sfn ../zuul/web/static web/build \ + && cd /tmp/src/web \ + && yarn install -d \ + && yarn build RUN assemble # The wheel install method doesn't run the setup hooks as the source based |