Browse Source

Merge "Stop building an explicit zuul-base image"

changes/02/633402/1
Zuul 3 years ago
committed by Gerrit Code Review
parent
commit
f019543ce9
  1. 3
      .zuul.yaml
  2. 14
      Dockerfile

3
.zuul.yaml

@ -122,9 +122,6 @@
allowed-projects: openstack-infra/zuul
vars: &zuul_image_vars
docker_images:
- context: .
repository: zuul/zuul-base
target: zuul-base
- context: .
repository: zuul/zuul
target: zuul

14
Dockerfile

@ -19,7 +19,7 @@ COPY . /tmp/src
RUN /tmp/src/tools/install-js-tools.sh
RUN assemble
FROM opendevorg/python-base as zuul-base
FROM opendevorg/python-base as zuul
COPY --from=builder /output/ /output
RUN echo "deb http://ftp.debian.org/debian stretch-backports main" >> /etc/apt/sources.list \
@ -30,24 +30,22 @@ RUN echo "deb http://ftp.debian.org/debian stretch-backports main" >> /etc/apt/s
RUN /output/install-from-bindep \
&& pip install --cache-dir=/output/wheels -r /output/zuul_base/requirements.txt \
&& rm -rf /output
FROM zuul-base as zuul
CMD ["/usr/local/bin/zuul"]
FROM zuul-base as zuul-executor
FROM zuul as zuul-executor
COPY --from=builder /output/ /output
RUN pip install --cache-dir=/output/wheels -r /output/zuul_executor/requirements.txt \
&& rm -rf /output
CMD ["/usr/local/bin/zuul-executor"]
FROM zuul-base as zuul-fingergw
FROM zuul as zuul-fingergw
CMD ["/usr/local/bin/zuul-fingergw"]
FROM zuul-base as zuul-merger
FROM zuul as zuul-merger
CMD ["/usr/local/bin/zuul-merger"]
FROM zuul-base as zuul-scheduler
FROM zuul as zuul-scheduler
CMD ["/usr/local/bin/zuul-scheduler"]
FROM zuul-base as zuul-web
FROM zuul as zuul-web
CMD ["/usr/local/bin/zuul-web"]
Loading…
Cancel
Save