summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-01-27 09:33:05 +0000
committerGerrit Code Review <review@openstack.org>2019-01-27 09:33:05 +0000
commitacf038aef4c4ebb3fd410a333e6c35b002e76e8a (patch)
tree1e7cf7c5057fde44c673a0127960419db85737bf
parentcecb78b109a720e96b140551689c3929e8a1defc (diff)
parent85e67f0bb9f071dc77193926f6487c9712854578 (diff)
Merge "Stop building an explicit nodepool-base image"
-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"]