[firefox][fennec][thunderbird] fix image build by installing dependencies *after* checkout

Author: jankeromnes

fennec/fennec.dockerfile

@@ -9,16 +9,6 @@ RUN mkdir /tmp/android-studio \
  && mv android-studio /home/user \
  && rm -rf /tmp/android-studio
 
-# Install Fennec build dependencies.
-RUN sudo apt-get update \
- && sudo apt-get install -y --no-install-recommends rsync yasm \
- && wget -O /tmp/bootstrap.py https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozboot/bin/bootstrap.py \
- && python /tmp/bootstrap.py --no-interactive --application-choice=mobile_android \
- && rm -f /tmp/bootstrap.py \
- && sudo rm -rf /var/lib/apt/lists/* \
- && rustup target add armv7-linux-androideabi \
- && rustup target add i686-linux-android
-
 # Download Fennec's source code.
 RUN hg clone --uncompressed https://hg.mozilla.org/mozilla-unified/ fennec \
  && cd fennec \
@@ -29,6 +19,14 @@ WORKDIR fennec
 ADD mozconfig /home/user/fennec/
 RUN sudo chown user:user /home/user/fennec/mozconfig
 
+# Install Fennec build dependencies.
+RUN sudo apt-get update \
+ && sudo apt-get install -y --no-install-recommends rsync yasm \
+ && python python/mozboot/bin/bootstrap.py --no-interactive --application-choice=mobile_android \
+ && sudo rm -rf /var/lib/apt/lists/* \
+ && rustup target add armv7-linux-androideabi \
+ && rustup target add i686-linux-android
+
 # Set up additional Fennec build dependencies.
 RUN mkdir -p /home/user/.mozbuild \
  && ./mach mercurial-setup -u \

firefox/firefox-git.dockerfile

@@ -1,14 +1,5 @@
 FROM janitortechnology/ubuntu-dev
 
-# Install Firefox build dependencies.
-# One-line setup command from:
-# https://developer.mozilla.org/en-US/docs/Mozilla/Developer_guide/Build_Instructions/Linux_Prerequisites#Most_Distros_-_One_Line_Bootstrap_Command
-RUN sudo apt-get update \
- && wget -O /tmp/bootstrap.py https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozboot/bin/bootstrap.py \
- && python /tmp/bootstrap.py --no-interactive --application-choice=browser \
- && rm -f /tmp/bootstrap.py \
- && sudo rm -rf /var/lib/apt/lists/*
-
 # Install Mozilla's moz-git-tools.
 RUN git clone https://github.com/mozilla/moz-git-tools /home/user/.moz-git-tools \
  && cd /home/user/.moz-git-tools \
@@ -31,6 +22,13 @@ WORKDIR /home/user/firefox
 # Add Firefox build configuration.
 COPY --chown=user:user mozconfig /home/user/firefox/
 
+# Install Firefox build dependencies.
+# One-line setup command from:
+# https://developer.mozilla.org/en-US/docs/Mozilla/Developer_guide/Build_Instructions/Linux_Prerequisites#Most_Distros_-_One_Line_Bootstrap_Command
+RUN sudo apt-get update \
+ && python python/mozboot/bin/bootstrap.py --no-interactive --application-choice=browser \
+ && sudo rm -rf /var/lib/apt/lists/*
+
 # Set up Mercurial extensions for Firefox.
 RUN mkdir -p /home/user/.mozbuild \
  && ./mach mercurial-setup -u \

firefox/firefox-hg.dockerfile

@@ -1,14 +1,5 @@
 FROM janitortechnology/ubuntu-dev
 
-# Install Firefox build dependencies.
-# One-line setup command from:
-# https://developer.mozilla.org/en-US/docs/Mozilla/Developer_guide/Build_Instructions/Linux_Prerequisites#Most_Distros_-_One_Line_Bootstrap_Command
-RUN sudo apt-get update \
- && wget -O /tmp/bootstrap.py https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozboot/bin/bootstrap.py \
- && python /tmp/bootstrap.py --no-interactive --application-choice=browser \
- && rm -f /tmp/bootstrap.py \
- && sudo rm -rf /var/lib/apt/lists/*
-
 # Download Firefox's source code.
 RUN hg clone --uncompressed https://hg.mozilla.org/mozilla-unified/ firefox \
  && cd firefox \
@@ -18,6 +9,13 @@ WORKDIR firefox
 # Add Firefox build configuration.
 COPY --chown=user:user mozconfig /home/user/firefox/
 
+# Install Firefox build dependencies.
+# One-line setup command from:
+# https://developer.mozilla.org/en-US/docs/Mozilla/Developer_guide/Build_Instructions/Linux_Prerequisites#Most_Distros_-_One_Line_Bootstrap_Command
+RUN sudo apt-get update \
+ && python python/mozboot/bin/bootstrap.py --no-interactive --application-choice=browser \
+ && sudo rm -rf /var/lib/apt/lists/*
+
 # Set up Mercurial extensions for Firefox.
 RUN mkdir -p /home/user/.mozbuild \
  && ./mach mercurial-setup -u

thunderbird/thunderbird.dockerfile

@@ -1,15 +1,6 @@
 FROM janitortechnology/ubuntu-dev
 MAINTAINER Philipp Kewisch "mozilla@kewis.ch"
 
-# Install Firefox build dependencies.
-# One-line setup command from:
-# https://developer.mozilla.org/en-US/docs/Mozilla/Developer_guide/Build_Instructions/Linux_Prerequisites#Most_Distros_-_One_Line_Bootstrap_Command
-RUN sudo apt-get update \
- && wget -qO /tmp/bootstrap.py https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozboot/bin/bootstrap.py \
- && python /tmp/bootstrap.py --no-interactive --application-choice=browser \
- && rm -f /tmp/bootstrap.py \
- && sudo rm -rf /var/lib/apt/lists/*
-
 # Download Thunderbird's source code.
 RUN hg clone --uncompressed https://hg.mozilla.org/comm-central/ thunderbird \
  && cd thunderbird \
@@ -20,6 +11,13 @@ WORKDIR thunderbird
 ADD .mozconfig /home/user/thunderbird/
 RUN sudo chown user:user /home/user/thunderbird/.mozconfig
 
+# Install Firefox build dependencies.
+# One-line setup command from:
+# https://developer.mozilla.org/en-US/docs/Mozilla/Developer_guide/Build_Instructions/Linux_Prerequisites#Most_Distros_-_One_Line_Bootstrap_Command
+RUN sudo apt-get update \
+ && python python/mozboot/bin/bootstrap.py --no-interactive --application-choice=browser \
+ && sudo rm -rf /var/lib/apt/lists/*
+
 # Set up Mercurial so mach doesn't complain.
 RUN mkdir -p /home/user/.mozbuild \
  && ./mozilla/mach mercurial-setup -u