Merge an extra commit from autoland to fix dep builds a=merge CLOSED TREE
authorWes Kocher <>
Thu, 01 Sep 2016 17:51:59 -0700
changeset 312324 475f0ee625239e06c5794d4cf34e88d6ee2fde31
parent 312323 39e767f9b1a0e1ba3e1cb4eae855578dc1e36e66 (current diff)
parent 312317 2677e17bd4d814c5048cf4e032405273ba599266 (diff)
child 312325 4f8bafdd88dc6cfdb5b5fe074dfb5d1abdb2f20c
child 312326 d5f20820c80514476f596090292a5d77c4b41e3b
child 312366 e3bc47928a98bf521be6d2a68d5789e8cae9f52d
child 312367 e12415c1560179174bd3bdaca11dd20e6b97d35a
push id20443
push dateFri, 02 Sep 2016 00:55:23 +0000
treeherderfx-team@4f8bafdd88dc [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
Merge an extra commit from autoland to fix dep builds a=merge CLOSED TREE
--- a/testing/docker/android-gradle-build/Dockerfile
+++ b/testing/docker/android-gradle-build/Dockerfile
@@ -1,18 +1,30 @@
-FROM          taskcluster/centos6-build-upd:
+# TODO remove VOLUME below when the base image is updated next.
+FROM          taskcluster/centos6-build-upd:
 MAINTAINER    Nick Alexander <>
 # BEGIN ../desktop-build/Dockerfile
+# TODO remove when base image is updated
+VOLUME /home/worker/workspace
+VOLUME /home/worker/tooltool-cache
 # Add build scripts; these are the entry points from the taskcluster worker, and
 # operate on environment variables
 ADD             bin /home/worker/bin
 RUN             chmod +x /home/worker/bin/*
+# Add wrapper scripts for xvfb allowing tasks to easily retry starting up xvfb
+# %include testing/docker/recipes/
+ADD topsrcdir/testing/docker/recipes/ /home/worker/scripts/
+# Add configuration
+COPY            dot-config                    /home/worker/.config
 # Generate machine uuid file
 RUN dbus-uuidgen --ensure=/var/lib/dbus/machine-id
 # Stubbed out credentials; mozharness looks for this file an issues a WARNING
 # if it's not found, which causes the build to fail.  Note that this needs to
 # be in the parent of the workspace directory and in the directory where
 # mozharness is run (not its --work-dir).  See Bug 1169652.
 ADD           oauth.txt /home/worker/
@@ -34,21 +46,24 @@ WORKDIR /
 USER root
 # Update base.
 RUN yum upgrade -y
 # Install JDK and Sonatype Nexus.  Cribbed directly from
+# Install the screen package here to use with xvfb.
+# Move installation to base centos6-build image once Bug 1272629 is fixed
 RUN yum install -y \
   createrepo \
   curl \
   java-1.7.0-openjdk-devel \
   java-1.7.0-openjdk \
+  screen \
   sudo \
   tar \
   unzip \
   wget \
   zip \
   && yum clean all
@@ -72,8 +87,11 @@ RUN tar zxf nexus-${NEXUS_VERSION}-bundl
 # Install tooltool directly from github.
 RUN mkdir /build
 ADD /build/
 RUN chmod +rx /build/
 # Back to the centos6-build workdir, matching desktop-build.
 WORKDIR /home/worker
+# Set a default command useful for debugging
+CMD ["/bin/bash", "--login"]
copy from testing/docker/desktop-build/dot-config/pip/pip.conf
copy to testing/docker/android-gradle-build/dot-config/pip/pip.conf