From 342c1207bf2ee0ced5310a353e900f281ca08939 Mon Sep 17 00:00:00 2001
From: John Whitlock <jwhitlock@mozilla.com>
Date: Mon, 7 Feb 2022 14:26:46 -0600
Subject: [PATCH] Improve .taskcluster.yml

Add improvements from docker-exec-webclient-server
---
 .taskcluster.yml | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/.taskcluster.yml b/.taskcluster.yml
index f9daea9..9ac7f4f 100644
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -41,20 +41,23 @@ tasks:
           maxRunTime: 3600
           env:
             BUILDKIT_PROGRESS: plain  # auto / tty is over-verbose
-            REPO_DIR: {$eval: as_slugid(proj_name + ":node:" + env.node_image_tag + ":tests")}
+            REPO_DIR: ${proj_name}
+          mounts:
+            - file: bin/docker-compose
+              content:
+                url: https://github.com/docker/compose/releases/download/v2.2.3/docker-compose-linux-x86_64
+                sha256: f15a7cd54a85f760a8ece92da63fb85b93036c72ead8056391b8a3fe9dc73134
           command:
             -
               - /bin/bash
               - -vxec
-              - >
-                git --version &&
-                git clone --no-progress "${repository}" "$REPO_DIR" &&
-                chmod a+wrx "$REPO_DIR" &&
-                cd "$REPO_DIR" &&
-                git config advice.detachedHead "false" &&
-                git checkout --no-progress "${head_rev}" &&
-                mkdir -p ~/bin &&
-                curl -sL "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o ~/bin/docker-compose &&
-                chmod +x ~/bin/docker-compose &&
-                ~/bin/docker-compose build --build-arg "NODE_VERSION=${env.node_image_tag}" &&
-                ~/bin/docker-compose run --rm test
+              - |
+                docker info
+                git --version
+                git clone --no-progress "${repository}" "$REPO_DIR"
+                cd "$REPO_DIR"
+                git config advice.detachedHead "false"
+                git checkout --no-progress "${head_rev}"
+                chmod a+x ../bin/docker-compose
+                ../bin/docker-compose build --build-arg "NODE_VERSION=${env.node_image_tag}"
+                ../bin/docker-compose run --rm test