summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2019-01-21 23:20:29 +0000
committerMonty Taylor <mordred@inaugust.com>2019-01-24 16:12:24 +0000
commit85e67f0bb9f071dc77193926f6487c9712854578 (patch)
tree7195dbd1d6ae2b7629e31adfd215c70eca928e66
parentf274c0f6bfd35ae562a158746b9457d3571978c9 (diff)
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
Notes
Notes (review): Code-Review+2: Tobias Henkel <tobias.henkel@bmw.de> Code-Review+2: David Shrewsbury <shrewsbury.dave@gmail.com> Code-Review+2: James E. Blair <corvus@inaugust.com> Workflow+1: James E. Blair <corvus@inaugust.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Sun, 27 Jan 2019 09:33:05 +0000 Reviewed-on: https://review.openstack.org/632188 Project: openstack-infra/nodepool Branch: refs/heads/master
-rw-r--r--.zuul.yaml3
-rw-r--r--Dockerfile8
2 files changed, 3 insertions, 8 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index d060d59..035390e 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -178,9 +178,6 @@
178 vars: &nodepool_image_vars 178 vars: &nodepool_image_vars
179 docker_images: 179 docker_images:
180 - context: . 180 - context: .
181 repository: zuul/nodepool-base
182 target: nodepool-base
183 - context: .
184 repository: zuul/nodepool 181 repository: zuul/nodepool
185 target: nodepool 182 target: nodepool
186 - context: . 183 - context: .
diff --git a/Dockerfile b/Dockerfile
index f6d6bf2..2d313b8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,16 +18,14 @@ FROM opendevorg/python-builder as builder
18COPY . /tmp/src 18COPY . /tmp/src
19RUN assemble 19RUN assemble
20 20
21FROM opendevorg/python-base as nodepool-base 21FROM opendevorg/python-base as nodepool
22 22
23COPY --from=builder /output/ /output 23COPY --from=builder /output/ /output
24RUN /output/install-from-bindep 24RUN /output/install-from-bindep
25
26FROM nodepool-base as nodepool
27CMD ["/usr/local/bin/nodepool"] 25CMD ["/usr/local/bin/nodepool"]
28 26
29FROM nodepool-base as nodepool-launcher 27FROM nodepool as nodepool-launcher
30CMD ["/usr/local/bin/nodepool-launcher"] 28CMD ["/usr/local/bin/nodepool-launcher"]
31 29
32FROM nodepool-base as nodepool-builder 30FROM nodepool as nodepool-builder
33CMD ["/usr/local/bin/nodepool-builder"] 31CMD ["/usr/local/bin/nodepool-builder"]