dind only as needed

This commit is contained in:
Simon Sapin 2018-09-10 18:22:06 +02:00
parent d023c28487
commit b72d5ca2a7

View file

@ -14,7 +14,7 @@ queue = taskcluster.Queue(options={"baseUrl": "http://taskcluster/queue/v1/"})
def create_task(name, command, artifacts=None, dependencies=None, env=None, cache=None, def create_task(name, command, artifacts=None, dependencies=None, env=None, cache=None,
scopes=None, image="buildpack-deps:bionic"): scopes=None, features=None, image="buildpack-deps:bionic"):
env = env or {} env = env or {}
for k in ["GITHUB_EVENT_CLONE_URL", "GITHUB_EVENT_COMMIT_SHA"]: for k in ["GITHUB_EVENT_CLONE_URL", "GITHUB_EVENT_COMMIT_SHA"]:
env.setdefault(k, os.environ[k]) env.setdefault(k, os.environ[k])
@ -62,9 +62,7 @@ def create_task(name, command, artifacts=None, dependencies=None, env=None, cach
} }
for artifact_name, path in artifacts or [] for artifact_name, path in artifacts or []
}, },
"features": { "features": features or {},
"dind": True, # docker-in-docker
},
}, },
} }
queue.createTask(task_id, payload) queue.createTask(task_id, payload)
@ -75,6 +73,9 @@ create_task(
"docker image build task", "docker image build task",
"./docker-image-build-task.sh servo-x86_64-linux", "./docker-image-build-task.sh servo-x86_64-linux",
image="buildpack-deps:trusty-scm", image="buildpack-deps:trusty-scm",
features={
"dind": True, # docker-in-docker
},
) )
build_task = create_task( build_task = create_task(