From cf97373cff6d4bb79fcc5ab6ffbb02716c79f39d Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Wed, 12 Sep 2018 20:23:10 +0200 Subject: [PATCH] =?UTF-8?q?Images=20don=E2=80=99t=20need=20a=20unique=20ta?= =?UTF-8?q?g?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- decision-task.py | 7 +++---- .../Dockerfile => servo-x86_64-linux.dockerfile | 0 2 files changed, 3 insertions(+), 4 deletions(-) rename docker/servo-x86_64-linux/Dockerfile => servo-x86_64-linux.dockerfile (100%) diff --git a/decision-task.py b/decision-task.py index 16e255e92b4..84ed7a8db7a 100644 --- a/decision-task.py +++ b/decision-task.py @@ -64,17 +64,16 @@ def create_task_with_in_tree_dockerfile(name, command, image, **kwargs): def build_image(name): - with open(os.path.join(REPO, "docker", name, "Dockerfile"), "rb") as f: + with open(os.path.join(REPO, name + ".dockerfile"), "rb") as f: dockerfile = f.read() image_build_task = create_task( "docker image build task for image: " + name, """ - echo "$DOCKERFILE" | docker build -t "$IMAGE" - - docker save "$IMAGE" | lz4 > /%s + echo "$DOCKERFILE" | docker build -t taskcluster-built - + docker save taskcluster-built | lz4 > /%s """ % IMAGE_ARTIFACT_FILENAME, env={ - "IMAGE": name, "DOCKERFILE": dockerfile, }, artifacts=[ diff --git a/docker/servo-x86_64-linux/Dockerfile b/servo-x86_64-linux.dockerfile similarity index 100% rename from docker/servo-x86_64-linux/Dockerfile rename to servo-x86_64-linux.dockerfile