Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18

# Conflicts:
#	browser/app/profile/firefox.js
#	browser/components/preferences/jar.mn

1 files changed, 6 insertions, 7 deletions

diff --git a/security/nss/automation/taskcluster/graph/src/image_builder.js b/security/nss/automation/taskcluster/graph/src/image_builder.js
index bc90e0242..d9d7755dc 100644
--- a/security/nss/automation/taskcluster/graph/src/image_builder.js
+++ b/security/nss/automation/taskcluster/graph/src/image_builder.js
@@ -30,14 +30,12 @@ export async function buildTask({name, path}) {
   let ns = `docker.images.v1.${process.env.TC_PROJECT}.${name}.hash.${hash}`;
 
   return {
-    name: "Image Builder",
-    image: "taskcluster/image_builder:0.1.5",
+    name: `Image Builder (${name})`,
+    image: "nssdev/image_builder:0.1.5",
     routes: ["index." + ns],
     env: {
-      HEAD_REPOSITORY: process.env.NSS_HEAD_REPOSITORY,
-      BASE_REPOSITORY: process.env.NSS_HEAD_REPOSITORY,
-      HEAD_REV: process.env.NSS_HEAD_REVISION,
-      HEAD_REF: process.env.NSS_HEAD_REVISION,
+      NSS_HEAD_REPOSITORY: process.env.NSS_HEAD_REPOSITORY,
+      NSS_HEAD_REVISION: process.env.NSS_HEAD_REVISION,
       PROJECT: process.env.TC_PROJECT,
       CONTEXT_PATH: path,
       HASH: hash
@@ -52,10 +50,11 @@ export async function buildTask({name, path}) {
     command: [
       "/bin/bash",
       "-c",
-      "/home/worker/bin/build_image.sh"
+      "bin/checkout.sh && nss/automation/taskcluster/scripts/build_image.sh"
     ],
     platform: "nss-decision",
     features: ["dind"],
+    maxRunTime: 7200,
     kind: "build",
     symbol: "I"
   };