From 51fb9213d51f9ca4f0faa8ddf2ae3f7e66c76c98 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Wed, 8 Sep 2021 00:32:24 +0000 Subject: [PATCH] Bug 1729414 - Remove the wgpu docker image. r=taskgraph-reviewers,bhearsum Bug 1726626 removed its only use. Differential Revision: https://phabricator.services.mozilla.com/D124737 --- taskcluster/ci/docker-image/kind.yml | 3 --- taskcluster/docker/wgpu/Dockerfile | 15 --------------- taskcluster/docker/wgpu/system-setup.sh | 11 ----------- 3 files changed, 29 deletions(-) delete mode 100644 taskcluster/docker/wgpu/Dockerfile delete mode 100644 taskcluster/docker/wgpu/system-setup.sh diff --git a/taskcluster/ci/docker-image/kind.yml b/taskcluster/ci/docker-image/kind.yml index 3c055973d921..530bfec22544 100644 --- a/taskcluster/ci/docker-image/kind.yml +++ b/taskcluster/ci/docker-image/kind.yml @@ -214,9 +214,6 @@ jobs: webrender: symbol: I(webrender) parent: debian10-base - wgpu: - symbol: I(wgpu) - parent: debian10-base condprof: symbol: I(condprof) parent: ubuntu1804-test diff --git a/taskcluster/docker/wgpu/Dockerfile b/taskcluster/docker/wgpu/Dockerfile deleted file mode 100644 index d5b72eafb7a5..000000000000 --- a/taskcluster/docker/wgpu/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM $DOCKER_IMAGE_PARENT -MAINTAINER Dzmitry Malyshau - -VOLUME /builds/worker/checkouts -VOLUME /builds/worker/workspace -VOLUME /builds/worker/tooltool-cache - -ADD system-setup.sh /setup/system-setup.sh -RUN bash /setup/system-setup.sh - -# We need this to install cargo-vendor as part of the wgpu-deps task -RUN apt-get install libssl-dev - -# Set a default command useful for debugging -CMD ["/bin/bash", "--login"] diff --git a/taskcluster/docker/wgpu/system-setup.sh b/taskcluster/docker/wgpu/system-setup.sh deleted file mode 100644 index ca7ae0c3c684..000000000000 --- a/taskcluster/docker/wgpu/system-setup.sh +++ /dev/null @@ -1,11 +0,0 @@ -apt-get -y update -apt-get install -y \ - bzip2 \ - cmake \ - curl \ - gcc \ - git \ - g++ \ - libx11-dev \ - pkg-config \ - software-properties-common