Browse Source

Merge "Stop building an explicit nodepool-base image"

tags/3.5.0
Zuul 10 months ago
parent
commit
acf038aef4
2 changed files with 3 additions and 8 deletions
  1. +0
    -3
      .zuul.yaml
  2. +3
    -5
      Dockerfile

+ 0
- 3
.zuul.yaml View File

@@ -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

+ 3
- 5
Dockerfile View File

@@ -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"]

Loading…
Cancel
Save