zuul/nodepool
Code Issues Proposed changes

Stop building an explicit nodepool-base image

Browse Source 
We have a utility image that we use for running the nodepool command
that doens't have any additional software installed. Although it does
set a COMMAND of /usr/local/bin/nodepool, it could still be useful as
a general base image for other people if they wanted such a thing.

Change-Id: I894e3d2dbe3cd2017f27ccc5e6fe298e9c9abd03
This commit is contained in:
Monty Taylor 2019-01-21 23:20:29 +00:00
parent f274c0f6bf
commit 85e67f0bb9
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"]