diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-11-12 21:57:04 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-12 21:57:04 -0500 |
| commit | 396df402185266fba595560ba9c642669fc834f0 (patch) | |
| tree | e39961b365dbb16c2c521833e7ee4cba3e0c01e4 | |
| parent | 97f1300739120c3e34e7d146da47c8f84e929e2b (diff) | |
| parent | 56dd10c2eee21f1107b4b250f8a5abd8cef65a3c (diff) | |
| download | servo-396df402185266fba595560ba9c642669fc834f0.tar.gz servo-396df402185266fba595560ba9c642669fc834f0.zip | |
Auto merge of #24712 - servo:lz4, r=jdm
Revert "Upload uncompressed Docker images"
https://bugzilla.mozilla.org/show_bug.cgi?id=1593543 is fixed.
This reverts commit 5abb013dfdacaf9b7029b4c07dcb93c016e378b8.
| -rw-r--r-- | etc/taskcluster/decisionlib.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/etc/taskcluster/decisionlib.py b/etc/taskcluster/decisionlib.py index 4d81a9b32e9..5009e939825 100644 --- a/etc/taskcluster/decisionlib.py +++ b/etc/taskcluster/decisionlib.py @@ -758,24 +758,24 @@ class DockerWorkerTask(UnixTaskMixin, Task): .with_index_and_artifacts_expire_in(CONFIG.docker_images_expire_in) .with_features("dind") .with_env(DOCKERFILE=dockerfile_contents) - .with_artifacts("/image.tar") + .with_artifacts("/image.tar.lz4") .with_script(""" echo "$DOCKERFILE" | docker build -t taskcluster-built - - docker save taskcluster-built > /image.tar + docker save taskcluster-built | lz4 > /image.tar.lz4 """) .with_docker_image( # https://github.com/servo/taskcluster-bootstrap-docker-images#image-builder "servobrowser/taskcluster-bootstrap:image-builder@sha256:" \ "0a7d012ce444d62ffb9e7f06f0c52fedc24b68c2060711b313263367f7272d9d" ) - .find_or_create("docker-image-uncompressed." + digest) + .find_or_create("docker-image." + digest) ) return self \ .with_dependencies(image_build_task) \ .with_docker_image({ "type": "task-image", - "path": "public/image.tar", + "path": "public/image.tar.lz4", "taskId": image_build_task, }) |