summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-01-27 10:19:40 +0000
committerGerrit Code Review <review@openstack.org>2019-01-27 10:19:40 +0000
commitf019543ce93f969e13c95f08092735cde221856e (patch)
treec7b2c60b46623e164494f423d27b189dea6c14ca
parenta29665f7db6c9b00ffe23aa78a03d7314c6dc695 (diff)
parent489f295bf92db5db8658afab5459d044094673e6 (diff)
Merge "Stop building an explicit zuul-base image"
-rw-r--r--.zuul.yaml3
-rw-r--r--Dockerfile14
2 files changed, 6 insertions, 11 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index 693385c..51b1acc 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -123,9 +123,6 @@
123 vars: &zuul_image_vars 123 vars: &zuul_image_vars
124 docker_images: 124 docker_images:
125 - context: . 125 - context: .
126 repository: zuul/zuul-base
127 target: zuul-base
128 - context: .
129 repository: zuul/zuul 126 repository: zuul/zuul
130 target: zuul 127 target: zuul
131 - context: . 128 - context: .
diff --git a/Dockerfile b/Dockerfile
index 4031bf5..01f70f4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,7 @@ COPY . /tmp/src
19RUN /tmp/src/tools/install-js-tools.sh 19RUN /tmp/src/tools/install-js-tools.sh
20RUN assemble 20RUN assemble
21 21
22FROM opendevorg/python-base as zuul-base 22FROM opendevorg/python-base as zuul
23 23
24COPY --from=builder /output/ /output 24COPY --from=builder /output/ /output
25RUN echo "deb http://ftp.debian.org/debian stretch-backports main" >> /etc/apt/sources.list \ 25RUN 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
30RUN /output/install-from-bindep \ 30RUN /output/install-from-bindep \
31 && pip install --cache-dir=/output/wheels -r /output/zuul_base/requirements.txt \ 31 && pip install --cache-dir=/output/wheels -r /output/zuul_base/requirements.txt \
32 && rm -rf /output 32 && rm -rf /output
33
34FROM zuul-base as zuul
35CMD ["/usr/local/bin/zuul"] 33CMD ["/usr/local/bin/zuul"]
36 34
37FROM zuul-base as zuul-executor 35FROM zuul as zuul-executor
38COPY --from=builder /output/ /output 36COPY --from=builder /output/ /output
39RUN pip install --cache-dir=/output/wheels -r /output/zuul_executor/requirements.txt \ 37RUN pip install --cache-dir=/output/wheels -r /output/zuul_executor/requirements.txt \
40 && rm -rf /output 38 && rm -rf /output
41CMD ["/usr/local/bin/zuul-executor"] 39CMD ["/usr/local/bin/zuul-executor"]
42 40
43FROM zuul-base as zuul-fingergw 41FROM zuul as zuul-fingergw
44CMD ["/usr/local/bin/zuul-fingergw"] 42CMD ["/usr/local/bin/zuul-fingergw"]
45 43
46FROM zuul-base as zuul-merger 44FROM zuul as zuul-merger
47CMD ["/usr/local/bin/zuul-merger"] 45CMD ["/usr/local/bin/zuul-merger"]
48 46
49FROM zuul-base as zuul-scheduler 47FROM zuul as zuul-scheduler
50CMD ["/usr/local/bin/zuul-scheduler"] 48CMD ["/usr/local/bin/zuul-scheduler"]
51 49
52FROM zuul-base as zuul-web 50FROM zuul as zuul-web
53CMD ["/usr/local/bin/zuul-web"] 51CMD ["/usr/local/bin/zuul-web"]