diff options
| author | Monty Taylor <mordred@inaugust.com> | 2020-06-23 10:44:03 -0500 |
|---|---|---|
| committer | Clark Boylan <clark.boylan@gmail.com> | 2020-06-23 10:08:06 -0700 |
| commit | 1f7c6fef9c394928bad28acb32c1180d0006844e (patch) | |
| tree | c658f3e6dc048c6e397ef3e9cac4f8244fc2e7cb /Dockerfile | |
| parent | 7c0bf04f5592fc448aa85649a5298f11816591a3 (diff) | |
| download | zuul-1f7c6fef9c394928bad28acb32c1180d0006844e.tar.gz | |
Create virtualenvs in series to avoid cache race
virtualenv 20.0.24 creates ~/.local/share/virtualenv with the
seed packages needed for making virtualenvs per-python version.
Creating empty virtualenvs is quick, so run those in sequence
to avoid race possibilities. Then, we can still run the
installs into the virtualenvs in parallel.
We also fix a bug in the console stream functional jobs and install pip
with the use of ensure-pip. This is necessary because the virtualenv
fix runs the stream functional jobs and the update to the stream
functional jobs relies on working docker images.
Change-Id: I3dec251d19dd7b3807848a54e6a20a8e89d30a4e
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile index e1a30d5b3..378a76eb9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,8 +30,10 @@ RUN 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 -# installations do so we have to call zuul-manage-ansible here. -RUN /output/install-from-bindep && zuul-manage-ansible +# installations do so we have to call zuul-manage-ansible here. Remove +# /root/.local/share/virtualenv after because it adds wheels into /root +# that we don't need after the install step so are a waste of space. +RUN /output/install-from-bindep && zuul-manage-ansible && rm -rf /root/.local/share/virtualenv RUN mkdir /tmp/openshift-install \ && curl -L $OPENSHIFT_URL -o /tmp/openshift-install/openshift-client.tgz \ |