From 5ccb03cda0b4b479c2339ada00025e93568e27fe Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Wed, 12 Sep 2018 16:11:02 +0200
Subject: [PATCH] servobrowser/taskcluster-bootstrap

---
 .taskcluster.yml |  5 ++---
 decision-task.py | 11 +++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.taskcluster.yml b/.taskcluster.yml
index 48d0dd60675..ff80ae2f92b 100644
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -26,9 +26,8 @@ tasks:
 
       payload:
         maxRunTime: 1200
-        # https://hub.docker.com/r/servobrowser/decision-task/builds/
-        # https://github.com/SimonSapin/servo-decision-task-image
-        image: "servobrowser/decision-task@sha256:8c9b4de60fc584828ae9a297a780945c2aa505d3b037ead3907554ab2e16aced"
+        # https://github.com/servo/taskcluster-bootstrap-docker-images#decision-task
+        image: "servobrowser/taskcluster-bootstrap:decision-task@sha256:28045b7ec0485ef363f8cb14f194008b47e9ede99f2ea40a1e945e921fce976e"
         features:
           taskclusterProxy: true
         env:
diff --git a/decision-task.py b/decision-task.py
index d910808b684..d41de9e9e5e 100644
--- a/decision-task.py
+++ b/decision-task.py
@@ -7,7 +7,7 @@ import taskcluster
 
 
 def main():
-    build_task = create_task_with_built_image(
+    build_task = create_task_with_in_tree_dockerfile(
         "build task",
         "./build-task.sh",
         image="servo-x86_64-linux",
@@ -36,10 +36,9 @@ def main():
     )
 
 
-# https://hub.docker.com/r/servobrowser/image-builder/
-# https://github.com/SimonSapin/servo-docker-image-builder-image
-IMAGE_BUILDER_IMAGE = "servobrowser/image-builder@sha256:" \
-    "f2370c4b28aa537e47c0cacb82cc53272233fa256b6634c0eebc46e2dd019333"
+# https://github.com/servo/taskcluster-bootstrap-docker-images#image-builder
+IMAGE_BUILDER_IMAGE = "servobrowser/taskcluster-bootstrap:image-builder@sha256:" \
+    "5ccb6e43c35de15924ebd3472433e8b3b352973f8dfe7c4c43c757ea60461bce"
 
 # https://docs.taskcluster.net/docs/reference/workers/docker-worker/docs/environment
 DECISION_TASK_ID = os.environ["TASK_ID"]
@@ -50,7 +49,7 @@ QUEUE = taskcluster.Queue(options={"baseUrl": "http://taskcluster/queue/v1/"})
 IMAGE_ARTIFACT_FILENAME = "image.tar.lz4"
 
 
-def create_task_with_built_image(name, command, image, **kwargs):
+def create_task_with_in_tree_dockerfile(name, command, image, **kwargs):
     image_build_task = build_image(image)
     kwargs.setdefault("dependencies", []).append(image_build_task)
     image = {