From 85e67f0bb9f071dc77193926f6487c9712854578 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Mon, 21 Jan 2019 23:20:29 +0000 Subject: [PATCH] Stop building an explicit nodepool-base image 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 --- .zuul.yaml | 3 --- Dockerfile | 8 +++----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index d060d591c..035390e81 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -177,9 +177,6 @@ description: Build Docker images. vars: &nodepool_image_vars docker_images: - - context: . - repository: zuul/nodepool-base - target: nodepool-base - context: . repository: zuul/nodepool target: nodepool diff --git a/Dockerfile b/Dockerfile index f6d6bf290..2d313b85e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,16 +18,14 @@ FROM opendevorg/python-builder as builder COPY . /tmp/src RUN assemble -FROM opendevorg/python-base as nodepool-base +FROM opendevorg/python-base as nodepool COPY --from=builder /output/ /output RUN /output/install-from-bindep - -FROM nodepool-base as nodepool CMD ["/usr/local/bin/nodepool"] -FROM nodepool-base as nodepool-launcher +FROM nodepool as 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"]