Skip to content

Remove support for docker-in-docker, privileged and loopback-audio do… #753

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove support for docker-in-docker, privileged and loopback-audio do… #753

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 5 additions & 19 deletions src/taskgraph/transforms/task.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,9 +496,6 @@ def verify_index(config, index):
Required("taskcluster-proxy"): bool,
Required("allow-ptrace"): bool,
Required("loopback-video"): bool,
Required("loopback-audio"): bool,
Required("docker-in-docker"): bool, # (aka 'dind')
Required("privileged"): bool,
# Paths to Docker volumes.
#
# For in-tree Docker images, volumes can be parsed from Dockerfile.
Expand Down Expand Up @@ -611,9 +608,6 @@ def build_docker_worker_payload(config, task, task_def):
if worker.get("chain-of-trust"):
features["chainOfTrust"] = True

if worker.get("docker-in-docker"):
features["dind"] = True

if task.get("needs-sccache"):
features["taskclusterProxy"] = True
task_def["scopes"].append(
Expand All @@ -630,16 +624,11 @@ def build_docker_worker_payload(config, task, task_def):

capabilities = {}

for lo in "audio", "video":
if worker.get("loopback-" + lo):
capitalized = "loopback" + lo.capitalize()
devices = capabilities.setdefault("devices", {})
devices[capitalized] = True
task_def["scopes"].append("docker-worker:capability:device:" + capitalized)

if worker.get("privileged"):
capabilities["privileged"] = True
task_def["scopes"].append("docker-worker:capability:privileged")
if worker.get("loopback-video"):
capitalized = "loopbackVideo"
devices = capabilities.setdefault("devices", {})
devices[capitalized] = True
task_def["scopes"].append("docker-worker:capability:device:" + capitalized)

task_def["payload"] = payload = {
"image": image,
Expand Down Expand Up @@ -1081,9 +1070,6 @@ def set_defaults(config, tasks):
worker.setdefault("taskcluster-proxy", False)
worker.setdefault("allow-ptrace", False)
worker.setdefault("loopback-video", False)
worker.setdefault("loopback-audio", False)
worker.setdefault("docker-in-docker", False)
worker.setdefault("privileged", False)
worker.setdefault("volumes", [])
worker.setdefault("env", {})
if "caches" in worker:
Expand Down
Loading