Backed out changeset 2a9ec8b312c3 (bug 1280178) for taskcluster-images failure

testing/docker/desktop-test/Dockerfile

@@ -1,4 +1,4 @@
-FROM          taskcluster/ubuntu1204-test-upd:0.1.11.20160628204600
+FROM          taskcluster/ubuntu1204-test-upd:0.1.9.20160329211700
 MAINTAINER    Jonas Finnemann Jensen <jopsen@gmail.com>
 
 # Add utilities and configuration
@@ -24,8 +24,9 @@ RUN usermod -a -G video worker
 
 RUN mkdir Documents; mkdir Pictures; mkdir Music; mkdir Videos; mkdir artifacts
 
-# install tc-vcs and tc-npm-cache
-RUN npm install -g taskcluster-vcs@2.3.12 \
+# install a new enough npm, plus tc-vcs and tc-npm-cache
+RUN npm install -g npm@^2.0.0 \
+ && npm install -g taskcluster-vcs@2.3.12 \
  && npm install -g taskcluster-npm-cache@1.1.14 \
  && rm -rf ~/.npm
 ENV PATH $PATH:/home/worker/bin

testing/docker/ubuntu1204-test-upd/Dockerfile

@@ -1,4 +1,4 @@
-FROM          taskcluster/ubuntu1204-test:0.1.11
+FROM          taskcluster/ubuntu1204-test:0.1.9
 MAINTAINER    Dustin J. Mitchell <dustin@mozilla.com>
 
 ### update to latest from upstream repositories

testing/docker/ubuntu1204-test-upd/VERSION

@@ -1 +1 @@
-0.1.11.20160628204600
+0.1.9.20160329211700

testing/docker/ubuntu1204-test/VERSION

@@ -1 +1 @@
-0.1.11
+0.1.9

testing/docker/ubuntu1204-test/system-setup.sh

@@ -161,9 +161,18 @@ EOF
 peep install -r requirements.txt
 
 # Install node
-wget https://nodejs.org/dist/v5.0.0/node-v5.0.0-linux-x64.tar.gz
-echo 'ef73b59048a0ed11d01633f0061627b7a9879257deb9add2255e4d0808f8b671  node-v5.0.0-linux-x64.tar.gz' | sha256sum -c
-tar -C /usr/local -xz --strip-components 1 < node-v5.0.0-linux-x64.tar.gz
+tooltool_fetch <<'EOF'
+[
+{
+    "size": 5676610,
+    "digest": "ce27b788dfd141a5ba7674332825fc136fe2c4f49a319dd19b3a87c8fffa7a97d86cbb8535661c9a68c9122719aa969fc6a8c886458a0df9fc822eec99ed130b",
+    "algorithm": "sha512",
+    "filename": "node-v0.10.36-linux-x64.tar.gz"
+}
+]
+
+EOF
+tar -C /usr/local -xz --strip-components 1 < node-*.tar.gz
 node -v  # verify
 
 # Install custom-built Debian packages.  These come from a set of repositories
@@ -258,13 +267,6 @@ mesa_version=$(dpkg-query -s libgl1-mesa-dri-lts-saucy | grep ^Version | awk '{
 cp sources.list.orig /etc/apt/sources.list
 apt-get update
 
-# node 5 requires a C++11 compiler.
-add-apt-repository ppa:ubuntu-toolchain-r/test
-apt-get update
-apt-get -y install gcc-4.8 g++-4.8
-update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 20 --slave /usr/bin/g++ g++ /usr/bin/g++-4.8
-update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.6 10 --slave /usr/bin/g++ g++ /usr/bin/g++-4.6
-
 # clean up
 apt_packages+=('mesa-common-dev')