Browse Source

Simplify dockerfile

There was a bug in opendevorg/python-builder that prevented extras from
being installed properly. Zuul worked around this with an explicit step
to install those extras. The depends on of this change fixes the
python-builder bug so we can remove the workaround from Zuul's
dockerfile.

Depends-On: https://review.opendev.org/744531
Change-Id: I28a783ca0582669c7fe9045aa912908f4229fd29
changes/33/744533/1
Clark Boylan 1 month ago
parent
commit
e64fd8fff8
1 changed files with 1 additions and 2 deletions
  1. +1
    -2
      Dockerfile

+ 1
- 2
Dockerfile View File

@@ -51,8 +51,7 @@ FROM docker.io/opendevorg/python-base:3.7 as zuul
ENV DEBIAN_FRONTEND=noninteractive

COPY --from=builder /output/ /output
RUN /output/install-from-bindep \
&& pip install --cache-dir=/output/wheels -r /output/zuul_base/requirements.txt \
RUN /output/install-from-bindep zuul_base \
&& rm -rf /output
RUN useradd -u 10001 -m -d /var/lib/zuul -c "Zuul Daemon" zuul



Loading…
Cancel
Save