Browse Source

Merge "Stop building an explicit zuul-base image"

tags/3.6.0
Zuul 5 months ago
parent
commit
f019543ce9
2 changed files with 6 additions and 11 deletions
  1. 0
    3
      .zuul.yaml
  2. 6
    8
      Dockerfile

+ 0
- 3
.zuul.yaml View File

@@ -122,9 +122,6 @@
122 122
     allowed-projects: openstack-infra/zuul
123 123
     vars: &zuul_image_vars
124 124
       docker_images:
125
-        - context: .
126
-          repository: zuul/zuul-base
127
-          target: zuul-base
128 125
         - context: .
129 126
           repository: zuul/zuul
130 127
           target: zuul

+ 6
- 8
Dockerfile View File

@@ -19,7 +19,7 @@ COPY . /tmp/src
19 19
 RUN /tmp/src/tools/install-js-tools.sh
20 20
 RUN assemble
21 21
 
22
-FROM opendevorg/python-base as zuul-base
22
+FROM opendevorg/python-base as zuul
23 23
 
24 24
 COPY --from=builder /output/ /output
25 25
 RUN echo "deb http://ftp.debian.org/debian stretch-backports main" >> /etc/apt/sources.list \
@@ -30,24 +30,22 @@ RUN echo "deb http://ftp.debian.org/debian stretch-backports main" >> /etc/apt/s
30 30
 RUN /output/install-from-bindep \
31 31
   && pip install --cache-dir=/output/wheels -r /output/zuul_base/requirements.txt \
32 32
   && rm -rf /output
33
-
34
-FROM zuul-base as zuul
35 33
 CMD ["/usr/local/bin/zuul"]
36 34
 
37
-FROM zuul-base as zuul-executor
35
+FROM zuul as zuul-executor
38 36
 COPY --from=builder /output/ /output
39 37
 RUN pip install --cache-dir=/output/wheels -r /output/zuul_executor/requirements.txt \
40 38
   && rm -rf /output
41 39
 CMD ["/usr/local/bin/zuul-executor"]
42 40
 
43
-FROM zuul-base as zuul-fingergw
41
+FROM zuul as zuul-fingergw
44 42
 CMD ["/usr/local/bin/zuul-fingergw"]
45 43
 
46
-FROM zuul-base as zuul-merger
44
+FROM zuul as zuul-merger
47 45
 CMD ["/usr/local/bin/zuul-merger"]
48 46
 
49
-FROM zuul-base as zuul-scheduler
47
+FROM zuul as zuul-scheduler
50 48
 CMD ["/usr/local/bin/zuul-scheduler"]
51 49
 
52
-FROM zuul-base as zuul-web
50
+FROM zuul as zuul-web
53 51
 CMD ["/usr/local/bin/zuul-web"]

Loading…
Cancel
Save