Browse Source

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
tags/3.5.0
Monty Taylor 6 months ago
parent
commit
85e67f0bb9
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 @@
177 177
     description: Build Docker images.
178 178
     vars: &nodepool_image_vars
179 179
       docker_images:
180
-        - context: .
181
-          repository: zuul/nodepool-base
182
-          target: nodepool-base
183 180
         - context: .
184 181
           repository: zuul/nodepool
185 182
           target: nodepool

+ 3
- 5
Dockerfile View File

@@ -18,16 +18,14 @@ FROM opendevorg/python-builder as builder
18 18
 COPY . /tmp/src
19 19
 RUN assemble
20 20
 
21
-FROM opendevorg/python-base as nodepool-base
21
+FROM opendevorg/python-base as nodepool
22 22
 
23 23
 COPY --from=builder /output/ /output
24 24
 RUN /output/install-from-bindep
25
-
26
-FROM nodepool-base as nodepool
27 25
 CMD ["/usr/local/bin/nodepool"]
28 26
 
29
-FROM nodepool-base as nodepool-launcher
27
+FROM nodepool as nodepool-launcher
30 28
 CMD ["/usr/local/bin/nodepool-launcher"]
31 29
 
32
-FROM nodepool-base as nodepool-builder
30
+FROM nodepool as nodepool-builder
33 31
 CMD ["/usr/local/bin/nodepool-builder"]

Loading…
Cancel
Save