Bug 1293686 - Move ubuntu1604-test's system-setup.sh to recipes; r?dustin draft
authorGregory Szorc <gps@mozilla.com>
Tue, 09 Aug 2016 09:34:03 -0700
changeset 398705 955ef3342c567b297804147a87bb0299dd8bcfbd
parent 398684 110678b15eff5d4a7c2cba7879bac6229237ba2e
child 398706 30a82a0fd847e952436816d122e93a418df76914
push id25603
push userbmo:gps@mozilla.com
push dateTue, 09 Aug 2016 16:41:42 +0000
reviewersdustin
bugs1293686
milestone51.0a1
Bug 1293686 - Move ubuntu1604-test's system-setup.sh to recipes; r?dustin In preparation for removing the ubuntu1604-test base image. We also change the script's location in the image to /setup because that's the path we use in most images. MozReview-Commit-ID: CvjTO8hmIkW
testing/docker/recipes/ubuntu1604-test-system-setup.sh
testing/docker/ubuntu1604-test/Dockerfile
testing/docker/ubuntu1604-test/system-setup.sh
rename from testing/docker/ubuntu1604-test/system-setup.sh
rename to testing/docker/recipes/ubuntu1604-test-system-setup.sh
--- a/testing/docker/ubuntu1604-test/Dockerfile
+++ b/testing/docker/ubuntu1604-test/Dockerfile
@@ -5,19 +5,19 @@ RUN useradd -d /home/worker -s /bin/bash
 WORKDIR /home/worker
 
 # %include testing/docker/recipes/tooltool.py
 ADD topsrcdir/testing/docker/recipes/tooltool.py /setup/tooltool.py
 
 # %include testing/docker/recipes/install-mercurial.sh
 ADD topsrcdir/testing/docker/recipes/install-mercurial.sh /setup/install-mercurial.sh
 
-# install non-build specific dependencies in a single layer
-ADD           system-setup.sh   /tmp/system-setup.sh
-RUN           bash /tmp/system-setup.sh
+# %include testing/docker/recipes/ubuntu1604-test-system-setup.sh
+ADD topsrcdir/testing/docker/recipes/ubuntu1604-test-system-setup.sh /setup/system-setup.sh
+RUN           bash /setup/system-setup.sh
 
 # %include testing/docker/recipes/run-task
 ADD topsrcdir/testing/docker/recipes/run-task /home/worker/bin/run-task
 
 # Set variable normally configured at login, by the shells parent process, these
 # are taken from GNU su manual
 ENV           HOME          /home/worker
 ENV           SHELL         /bin/bash