Bug 1433033 - Remove a few packages from the toolchain-build image. r?dustin draft
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 25 Jan 2018 15:13:20 +0900
changeset 747484 2eaffe6795e27fd455c9b5739748bf35bf9e6da0
parent 747408 71d24ffdbc7d7114e4b08f1631a451045c27ac66
child 747485 e05fd8f04dd53ce5d713d0b8836e04327b10d47e
push id96908
push userbmo:mh+mozilla@glandium.org
push dateFri, 26 Jan 2018 02:31:20 +0000
reviewersdustin
bugs1433033, 1429669
milestone60.0a1
Bug 1433033 - Remove a few packages from the toolchain-build image. r?dustin python-dev was required to build mercurial, but the need for that was removed in bug 1429669. The others were required for mingw32 toolchains, but they are using a different docker image and will switch to another different docker image.
taskcluster/docker/toolchain-build/Dockerfile
--- a/taskcluster/docker/toolchain-build/Dockerfile
+++ b/taskcluster/docker/toolchain-build/Dockerfile
@@ -38,45 +38,40 @@ RUN apt-get -o Acquire::Check-Valid-Unti
       apt-transport-https \
       ca-certificates
 
 # %ARG DOCKER_IMAGE_PACKAGES
 RUN for task in $DOCKER_IMAGE_PACKAGES; do \
       echo "deb [trusted=yes] https://queue.taskcluster.net/v1/task/$task/runs/0/artifacts/public/build/ debian/" >> /etc/apt/sources.list; \
     done
 
-RUN dpkg --add-architecture i386
-
 RUN apt-get -o Acquire::Check-Valid-Until=false update -q && \
     apt-get install -yyq --no-install-recommends \
       autoconf \
       automake \
       bison \
       build-essential \
       curl \
       cmake \
       flex \
       gawk \
       gcc-multilib \
       git \
       gnupg \
       libbz2-dev \
       libssl-dev \
       libtool \
-      libx11-dev:i386 \
       make \
       mercurial \
       ninja-build \
       p7zip-full \
       procps \
-      python-dev \
       python-pip \
       python-setuptools \
       python-virtualenv \
-      scons \
       subversion \
       tar \
       unzip \
       uuid \
       uuid-dev \
       wget \
       xz-utils \
       zip \