Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 22:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #24712 - servo:lz4, r=jdm

Browse source 
Revert "Upload uncompressed Docker images"

https://bugzilla.mozilla.org/show_bug.cgi?id=1593543 is fixed.

This reverts commit 5abb013dfd.
This commit is contained in:
bors-servo 2019-11-12 21:57:04 -05:00 • committed by GitHub
commit 396df40218
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
etc/taskcluster/decisionlib.py
View file

@ -758,24 +758,24 @@ class DockerWorkerTask(UnixTaskMixin, Task):
.with_index_and_artifacts_expire_in(CONFIG.docker_images_expire_in) .with_index_and_artifacts_expire_in(CONFIG.docker_images_expire_in)
.with_features("dind") .with_features("dind")
.with_env(DOCKERFILE=dockerfile_contents) .with_env(DOCKERFILE=dockerfile_contents)
.with_artifacts("/image.tar") .with_artifacts("/image.tar.lz4")
.with_script(""" .with_script("""
echo "$DOCKERFILE" | docker build -t taskcluster-built - echo "$DOCKERFILE" | docker build -t taskcluster-built -
docker save taskcluster-built > /image.tar docker save taskcluster-built | lz4 > /image.tar.lz4
""") """)
.with_docker_image( .with_docker_image(
# https://github.com/servo/taskcluster-bootstrap-docker-images#image-builder # https://github.com/servo/taskcluster-bootstrap-docker-images#image-builder
"servobrowser/taskcluster-bootstrap:image-builder@sha256:" \ "servobrowser/taskcluster-bootstrap:image-builder@sha256:" \
"0a7d012ce444d62ffb9e7f06f0c52fedc24b68c2060711b313263367f7272d9d" "0a7d012ce444d62ffb9e7f06f0c52fedc24b68c2060711b313263367f7272d9d"
) )
.find_or_create("docker-image-uncompressed." + digest) .find_or_create("docker-image." + digest)
) )
return self \ return self \
.with_dependencies(image_build_task) \ .with_dependencies(image_build_task) \
.with_docker_image({ .with_docker_image({
"type": "task-image", "type": "task-image",
"path": "public/image.tar", "path": "public/image.tar.lz4",
"taskId": image_build_task, "taskId": image_build_task,
}) })