From d029dd76c3ede6f484ab4f6f6da0eb1523cf0a9c Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Tue, 11 Sep 2018 19:16:00 +0200
Subject: [PATCH] Use custom Docker image for building other images

---
 decision-task.py           | 18 ++++++++++++++----
 docker-image-build-task.sh | 14 --------------
 docker/build.sh            |  7 -------
 3 files changed, 14 insertions(+), 25 deletions(-)
 delete mode 100755 docker-image-build-task.sh
 delete mode 100755 docker/build.sh

diff --git a/decision-task.py b/decision-task.py
index 32b4d4f7010..bc09bc18e6d 100644
--- a/decision-task.py
+++ b/decision-task.py
@@ -67,14 +67,24 @@ def create_task(name, command, artifacts=None, dependencies=None, env=None, cach
 
 image_build_task = create_task(
     "docker image build task",
-    "./docker-image-build-task.sh servo-x86_64-linux",
-    image="buildpack-deps:trusty-scm",
-    features={
-        "dind": True,  # docker-in-docker
+    """
+        docker build -t "$IMAGE" "docker/$IMAGE"
+        docker save "$IMAGE" | lz4 > /image.tar.lz4
+    """,
+    env={
+        "IMAGE": "servo-x86_64-linux",
     },
     artifacts=[
         ("image.tar.lz4", "/image.tar.lz4"),
     ],
+
+    # https://hub.docker.com/r/servobrowser/image-builder/
+    # https://github.com/SimonSapin/servo-docker-image-builder-image
+    image="servobrowser/image-builder@sha256:f2370c4b28aa537e47c0cacb82cc53272233fa256b6634c0eebc46e2dd019333",
+
+    features={
+        "dind": True,  # docker-in-docker
+    },
 )
 
 build_task = create_task(
diff --git a/docker-image-build-task.sh b/docker-image-build-task.sh
deleted file mode 100755
index dd4aa97e83f..00000000000
--- a/docker-image-build-task.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-set -x
-
-image="$1"
-
-apt-get update -q
-apt-get install -qy --no-install-recommends \
-    docker.io \
-    liblz4-tool
-docker version
-./docker/build.sh "$image"
-docker save "$image" | lz4 > /image.tar.lz4
diff --git a/docker/build.sh b/docker/build.sh
deleted file mode 100755
index 4002d783524..00000000000
--- a/docker/build.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -e
-set -x
-
-image="$1"
-docker build -t "$image" "$(dirname $0)/$image"