Bug 1427069 - Don't copy unused setup scripts to the android-build docker image. r=dustin
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 26 Dec 2017 17:13:50 +0900
changeset 449211 a70c7890a9b46a8aaef27fb181e309367689e837
parent 449210 19cf91b7a1d366cf9cd03cc62a1ce2df8d168146
child 449212 b1e8f652c879a7ee558958fe8e1df1e86fdffb0c
push id8527
push userCallek@gmail.com
push dateThu, 11 Jan 2018 21:05:50 +0000
treeherdermozilla-beta@95342d212a7a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdustin
bugs1427069
milestone59.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1427069 - Don't copy unused setup scripts to the android-build docker image. r=dustin The debian-build-system-setup.sh script doesn't use the install-make and install-cmake scripts, so it's unnecessary to install them in /setup.
taskcluster/docker/android-build/Dockerfile
--- a/taskcluster/docker/android-build/Dockerfile
+++ b/taskcluster/docker/android-build/Dockerfile
@@ -90,22 +90,16 @@ COPY topsrcdir/python/mozbuild/mozbuild/
 COPY topsrcdir/testing/mozharness/external_tools/robustcheckout.py /usr/local/mercurial/robustcheckout.py
 
 # %include taskcluster/docker/recipes/common.sh
 COPY topsrcdir/taskcluster/docker/recipes/common.sh /setup/common.sh
 
 # %include taskcluster/docker/recipes/install-mercurial.sh
 COPY topsrcdir/taskcluster/docker/recipes/install-mercurial.sh /setup/install-mercurial.sh
 
-# %include taskcluster/docker/recipes/install-make.sh
-COPY topsrcdir/taskcluster/docker/recipes/install-make.sh /setup/install-make.sh
-
-# %include taskcluster/docker/recipes/install-cmake.sh
-COPY topsrcdir/taskcluster/docker/recipes/install-cmake.sh /setup/install-cmake.sh
-
 # %include taskcluster/docker/recipes/debian-build-system-setup.sh
 COPY topsrcdir/taskcluster/docker/recipes/debian-build-system-setup.sh /setup/system-setup.sh
 
 RUN bash /setup/system-setup.sh
 
 # Add wrapper scripts for xvfb allowing tasks to easily retry starting up xvfb.
 # %include taskcluster/docker/recipes/xvfb.sh
 COPY topsrcdir/taskcluster/docker/recipes/xvfb.sh /builds/worker/scripts/xvfb.sh