Skip to content

Commit

Permalink
Actually remove six from Dockerfile
Browse files Browse the repository at this point in the history
With #24484 removing the dependency on system six, we are now able to
remove it from the Docker image, which was introduced in #23733.

Removing this has the benefit of avoiding introducing accidental
dependency.
  • Loading branch information
Hexcles committed Jul 8, 2020
1 parent dcc2ecf commit bd5e423
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .taskcluster.yml
Expand Up @@ -57,7 +57,7 @@ tasks:
owner: ${owner}
source: ${event.repository.clone_url}
payload:
image: webplatformtests/wpt:0.40
image: webplatformtests/wpt:0.41
maxRunTime: 7200
artifacts:
public/results:
Expand Down
2 changes: 1 addition & 1 deletion tools/ci/tc/tasks/test.yml
Expand Up @@ -4,7 +4,7 @@ components:
workerType: ci
schedulerId: taskcluster-github
deadline: "24 hours"
image: webplatformtests/wpt:0.40
image: webplatformtests/wpt:0.41
maxRunTime: 7200
artifacts:
public/results:
Expand Down
4 changes: 0 additions & 4 deletions tools/docker/Dockerfile
Expand Up @@ -57,10 +57,6 @@ RUN pip2 install virtualenv
RUN pip3 install --upgrade pip
RUN pip3 install virtualenv

# Ensure we have up-to-date six
RUN pip2 install --upgrade six
RUN pip3 install --upgrade six

ENV TZ "UTC"
RUN echo "${TZ}" > /etc/timezone \
&& dpkg-reconfigure --frontend noninteractive tzdata
Expand Down

0 comments on commit bd5e423

Please sign in to comment.