Bug 1290531 - Move tooltool.py into shared directory; r?dustin draft
authorGregory Szorc <gps@mozilla.com>
Fri, 29 Jul 2016 13:50:24 -0700
changeset 395040 b26e6e8ff3513781f9a06ecab1b75cd7ee055ad7
parent 395039 64918948a9593c0eae09aca37c163ea87ab53f56
child 526937 b71fa347e7645a89de284c263f7138a4790fd892
push id24705
push userbmo:gps@mozilla.com
push dateMon, 01 Aug 2016 18:26:57 +0000
Bug 1290531 - Move tooltool.py into shared directory; r?dustin The reason tooltool.py was vendored in testing/docker/decision was because locally built Docker images were using vanilla `docker build` and didn't know about our special Dockerfile syntax to allow the inclusion of images from outside the directory where the Dockerfile was located. Now that locally-built Docker images know of our special Dockerfile syntax, we can include files from anywhere. So, move tooltool.py to a shared directory, away from the decision image. I didn't bump the version of the decision image because there are a few more things I want to do to this image, such as have it use the `checkout-gecko-and-run` script instead of its own script. I think I'll do that in a separate bug, however. MozReview-Commit-ID: 12ze9GJFMJq
--- a/testing/docker/decision/Dockerfile
+++ b/testing/docker/decision/Dockerfile
@@ -1,16 +1,19 @@
 FROM          ubuntu:16.04
 MAINTAINER    Greg Arndt <garndt@mozilla.com>
 # Add worker user
 RUN useradd -d /home/worker -s /bin/bash -m worker
 RUN mkdir /home/worker/artifacts && chown worker:worker /home/worker/artifacts
-ADD system-setup.sh tooltool.py /tmp/
+# %include testing/docker/recipes/tooltool.py
+ADD topsrcdir/testing/docker/recipes/tooltool.py /tmp/tooltool.py
+ADD system-setup.sh /tmp/system-setup.sh
 RUN bash /tmp/system-setup.sh
 ADD bin /home/worker/bin
 ENV PATH /home/worker/bin:$PATH
 ENV SHELL /bin/bash
 ENV HOME /home/worker
--- a/testing/docker/lint/Dockerfile
+++ b/testing/docker/lint/Dockerfile
@@ -1,17 +1,17 @@
 FROM          ubuntu:16.04
 MAINTAINER    Andrew Halberstadt <ahalberstadt@mozilla.com>
 RUN useradd -d /home/worker -s /bin/bash -m worker
 WORKDIR /home/worker
 RUN mkdir /build
-# %include testing/docker/decision/tooltool.py
-ADD topsrcdir/testing/docker/decision/tooltool.py /build/tooltool.py
+# %include testing/docker/recipes/tooltool.py
+ADD topsrcdir/testing/docker/recipes/tooltool.py /build/tooltool.py
 # %include testing/docker/recipes/install-mercurial.sh
 ADD topsrcdir/testing/docker/recipes/install-mercurial.sh /build/install-mercurial.sh
 ADD system-setup.sh /tmp/system-setup.sh
 RUN bash /tmp/system-setup.sh
 # %include testing/docker/recipes/checkout-gecko-and-run
 ADD topsrcdir/testing/docker/recipes/checkout-gecko-and-run /home/worker/bin/checkout-gecko-and-run
rename from testing/docker/decision/tooltool.py
rename to testing/docker/recipes/tooltool.py