Merge "Stop building an explicit zuul-base image"
This commit is contained in:
commit
f019543ce9
|
@ -122,9 +122,6 @@
|
||||||
allowed-projects: openstack-infra/zuul
|
allowed-projects: openstack-infra/zuul
|
||||||
vars: &zuul_image_vars
|
vars: &zuul_image_vars
|
||||||
docker_images:
|
docker_images:
|
||||||
- context: .
|
|
||||||
repository: zuul/zuul-base
|
|
||||||
target: zuul-base
|
|
||||||
- context: .
|
- context: .
|
||||||
repository: zuul/zuul
|
repository: zuul/zuul
|
||||||
target: zuul
|
target: zuul
|
||||||
|
|
14
Dockerfile
14
Dockerfile
|
@ -19,7 +19,7 @@ COPY . /tmp/src
|
||||||
RUN /tmp/src/tools/install-js-tools.sh
|
RUN /tmp/src/tools/install-js-tools.sh
|
||||||
RUN assemble
|
RUN assemble
|
||||||
|
|
||||||
FROM opendevorg/python-base as zuul-base
|
FROM opendevorg/python-base as zuul
|
||||||
|
|
||||||
COPY --from=builder /output/ /output
|
COPY --from=builder /output/ /output
|
||||||
RUN echo "deb http://ftp.debian.org/debian stretch-backports main" >> /etc/apt/sources.list \
|
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 \
|
RUN /output/install-from-bindep \
|
||||||
&& pip install --cache-dir=/output/wheels -r /output/zuul_base/requirements.txt \
|
&& pip install --cache-dir=/output/wheels -r /output/zuul_base/requirements.txt \
|
||||||
&& rm -rf /output
|
&& rm -rf /output
|
||||||
|
|
||||||
FROM zuul-base as zuul
|
|
||||||
CMD ["/usr/local/bin/zuul"]
|
CMD ["/usr/local/bin/zuul"]
|
||||||
|
|
||||||
FROM zuul-base as zuul-executor
|
FROM zuul as zuul-executor
|
||||||
COPY --from=builder /output/ /output
|
COPY --from=builder /output/ /output
|
||||||
RUN pip install --cache-dir=/output/wheels -r /output/zuul_executor/requirements.txt \
|
RUN pip install --cache-dir=/output/wheels -r /output/zuul_executor/requirements.txt \
|
||||||
&& rm -rf /output
|
&& rm -rf /output
|
||||||
CMD ["/usr/local/bin/zuul-executor"]
|
CMD ["/usr/local/bin/zuul-executor"]
|
||||||
|
|
||||||
FROM zuul-base as zuul-fingergw
|
FROM zuul as zuul-fingergw
|
||||||
CMD ["/usr/local/bin/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"]
|
CMD ["/usr/local/bin/zuul-merger"]
|
||||||
|
|
||||||
FROM zuul-base as zuul-scheduler
|
FROM zuul as zuul-scheduler
|
||||||
CMD ["/usr/local/bin/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"]
|
CMD ["/usr/local/bin/zuul-web"]
|
||||||
|
|
Loading…
Reference in New Issue