Bug 1293686 - Merge ubuntu1604-test into desktop1604-test; r=dustin
authorGregory Szorc <gps@mozilla.com>
Tue, 09 Aug 2016 09:38:12 -0700
changeset 398792 537d891fbceb87ee43e7d50e3a51c1122fe86bf4
parent 398791 338addbf100c98350099d3a13b6621d9294159a8
child 398793 82eba2e77c35de3026ee1c501dc43d13b57df508
push id25628
push userbmo:gps@mozilla.com
push dateTue, 09 Aug 2016 18:38:55 +0000
reviewersdustin
bugs1293686
milestone51.0a1
Bug 1293686 - Merge ubuntu1604-test into desktop1604-test; r=dustin The code from the base ubuntu1604-test image has been moved to the desktop1604-test image. Since ubuntu1604-test is no longer referenced, we remove it. With this change, the desktop1604-test Docker image no longer requires a push to the Docker Hub when updating: it is updated fully within TaskCluster. This will result in more image transfers in automation and to developer machines. But we do gain a lot of convenience updating the images. MozReview-Commit-ID: GRpPOfs6pn3
testing/docker/desktop1604-test/Dockerfile
testing/docker/ubuntu1604-test/Dockerfile
testing/docker/ubuntu1604-test/REGISTRY
testing/docker/ubuntu1604-test/VERSION
--- a/testing/docker/desktop1604-test/Dockerfile
+++ b/testing/docker/desktop1604-test/Dockerfile
@@ -1,16 +1,42 @@
-FROM          taskcluster/ubuntu1604-test:0.1.3
+FROM          ubuntu:16.04
 MAINTAINER    Joel Maher <joel.maher@gmail.com>
 
+RUN useradd -d /home/worker -s /bin/bash -m worker
+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
+
+# %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
+
 # This will create a host mounted filesystem when the cache is stripped
 # on Try. This cancels out some of the performance losses of aufs. See
 # bug 1291940.
 VOLUME /home/worker/workspace
 
+# 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
+ENV           USER          worker
+ENV           LOGNAME       worker
+ENV           HOSTNAME      taskcluster-worker
+ENV           LANG          en_US.UTF-8
+ENV           LC_ALL        en_US.UTF-8
+
 # Add utilities and configuration
 COPY           dot-files/config              /home/worker/.config
 COPY           dot-files/pulse               /home/worker/.pulse
 COPY           bin                           /home/worker/bin
 RUN            chmod +x bin/*
 # TODO: remove this when buildbot is gone
 COPY           buildprops.json               /home/worker/buildprops.json
 COPY           tc-vcs-config.yml /etc/taskcluster-vcs.yml
deleted file mode 100644
--- a/testing/docker/ubuntu1604-test/Dockerfile
+++ /dev/null
@@ -1,31 +0,0 @@
-FROM          ubuntu:16.04
-MAINTAINER    Joel Maher <joel.maher@gmail.com>
-
-RUN useradd -d /home/worker -s /bin/bash -m worker
-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
-
-# %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
-ENV           USER          worker
-ENV           LOGNAME       worker
-ENV           HOSTNAME      taskcluster-worker
-ENV           LANG          en_US.UTF-8
-ENV           LC_ALL        en_US.UTF-8
-
-# Set a default command useful for debugging
-CMD ["/bin/bash", "--login"]
deleted file mode 100644
--- a/testing/docker/ubuntu1604-test/REGISTRY
+++ /dev/null
@@ -1,1 +0,0 @@
-taskcluster
deleted file mode 100644
--- a/testing/docker/ubuntu1604-test/VERSION
+++ /dev/null
@@ -1,1 +0,0 @@
-0.1.3