zuul/nodepool
Code Issues Proposed changes

Merge "Stop building an explicit nodepool-base image"

Browse Source
This commit is contained in:
Zuul 2019-01-27 09:33:05 +00:00 committed by Gerrit Code Review
commit acf038aef4
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.zuul.yaml
View File

@ -177,9 +177,6 @@
description: Build Docker images. description: Build Docker images.
vars: &nodepool_image_vars vars: &nodepool_image_vars
docker_images: docker_images:
- context: .
repository: zuul/nodepool-base
target: nodepool-base
- context: . - context: .
repository: zuul/nodepool repository: zuul/nodepool
target: nodepool target: nodepool

8
Dockerfile
View File

@ -18,16 +18,14 @@ FROM opendevorg/python-builder as builder
COPY . /tmp/src COPY . /tmp/src
RUN assemble RUN assemble
FROM opendevorg/python-base as nodepool-base FROM opendevorg/python-base as nodepool
COPY --from=builder /output/ /output COPY --from=builder /output/ /output
RUN /output/install-from-bindep RUN /output/install-from-bindep
FROM nodepool-base as nodepool
CMD ["/usr/local/bin/nodepool"] CMD ["/usr/local/bin/nodepool"]
FROM nodepool-base as nodepool-launcher FROM nodepool as nodepool-launcher
CMD ["/usr/local/bin/nodepool-launcher"] CMD ["/usr/local/bin/nodepool-launcher"]
FROM nodepool-base as nodepool-builder FROM nodepool as nodepool-builder
CMD ["/usr/local/bin/nodepool-builder"] CMD ["/usr/local/bin/nodepool-builder"]