From 78702700e1f333e3ae1616e96bfc92da8dc21dd8 Mon Sep 17 00:00:00 2001 From: PhistucK Date: Mon, 21 May 2018 16:58:11 +0300 Subject: [PATCH 1/6] Add an alias for job-limited Ninja --- chromium/chromium.dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/chromium/chromium.dockerfile b/chromium/chromium.dockerfile index 339b885..fe6466f 100644 --- a/chromium/chromium.dockerfile +++ b/chromium/chromium.dockerfile @@ -4,7 +4,10 @@ FROM janitortechnology/ubuntu-dev RUN git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git ENV PATH $PATH:/home/user/depot_tools RUN echo "\n# Add Chromium's depot_tools to the PATH." >> .bashrc \ - && echo "export PATH=\"\$PATH:/home/user/depot_tools\"" >> .bashrc + && echo "export PATH=\"\$PATH:/home/user/depot_tools\"" >> .bashrc \ + +# Make default Ninja parallelism use 8 parallel jobs. +RUN echo "\nalias ninja='ninja -j8'" >> .bash_aliases # Enable bash completion for git cl. RUN echo "\n# The next line enables bash completion for git cl." >> .bashrc \ From 6fb8cccd33bd8bf732f1d4f7d116af53dafc2788 Mon Sep 17 00:00:00 2001 From: PhistucK Date: Mon, 21 May 2018 16:59:19 +0300 Subject: [PATCH 2/6] Removed the alias before building --- chromium/chromium-update.dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/chromium/chromium-update.dockerfile b/chromium/chromium-update.dockerfile index da0d8c0..2d4117e 100644 --- a/chromium/chromium-update.dockerfile +++ b/chromium/chromium-update.dockerfile @@ -8,8 +8,10 @@ RUN sudo apt-get update -q && sudo apt-get upgrade -qy RUN cd /home/user/depot_tools \ && git pull --rebase origin master -# Update and rebuild Chromium's source code. -RUN cd /home/user/chromium/src \ +# Remove the parallelism limited Ninja alias and +# update and rebuild Chromium's source code. +RUN unalias ninja \ + && cd /home/user/chromium/src \ && git fetch origin \ && git reset --hard origin/master \ && gclient sync --delete --jobs=`nproc` \ From 92bb685fad7b26e0d678c9ecb61f721b6a30d6da Mon Sep 17 00:00:00 2001 From: PhistucK Date: Tue, 22 May 2018 22:58:04 +0300 Subject: [PATCH 3/6] Removed a stray \ --- chromium/chromium.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chromium/chromium.dockerfile b/chromium/chromium.dockerfile index fe6466f..ef9588a 100644 --- a/chromium/chromium.dockerfile +++ b/chromium/chromium.dockerfile @@ -4,7 +4,7 @@ FROM janitortechnology/ubuntu-dev RUN git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git ENV PATH $PATH:/home/user/depot_tools RUN echo "\n# Add Chromium's depot_tools to the PATH." >> .bashrc \ - && echo "export PATH=\"\$PATH:/home/user/depot_tools\"" >> .bashrc \ + && echo "export PATH=\"\$PATH:/home/user/depot_tools\"" >> .bashrc # Make default Ninja parallelism use 8 parallel jobs. RUN echo "\nalias ninja='ninja -j8'" >> .bash_aliases From 73e92fd6480404b9add2c9dc111712d9a5732a88 Mon Sep 17 00:00:00 2001 From: PhistucK Date: Tue, 22 May 2018 22:59:41 +0300 Subject: [PATCH 4/6] Removed unalias and the explicit job count --- chromium/chromium-update.dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/chromium/chromium-update.dockerfile b/chromium/chromium-update.dockerfile index 2d4117e..44c28f2 100644 --- a/chromium/chromium-update.dockerfile +++ b/chromium/chromium-update.dockerfile @@ -10,9 +10,8 @@ RUN cd /home/user/depot_tools \ # Remove the parallelism limited Ninja alias and # update and rebuild Chromium's source code. -RUN unalias ninja \ - && cd /home/user/chromium/src \ +RUN cd /home/user/chromium/src \ && git fetch origin \ && git reset --hard origin/master \ && gclient sync --delete --jobs=`nproc` \ - && ninja -C out/Default chrome -j`nproc` + && ninja -C out/Default chrome From e1dae4cf0fad54719eefc175d9b4524394b33a81 Mon Sep 17 00:00:00 2001 From: PhistucK Date: Thu, 24 May 2018 08:17:05 +0300 Subject: [PATCH 5/6] Removed a stray comment --- chromium/chromium-update.dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/chromium/chromium-update.dockerfile b/chromium/chromium-update.dockerfile index 44c28f2..ef1da58 100644 --- a/chromium/chromium-update.dockerfile +++ b/chromium/chromium-update.dockerfile @@ -8,8 +8,7 @@ RUN sudo apt-get update -q && sudo apt-get upgrade -qy RUN cd /home/user/depot_tools \ && git pull --rebase origin master -# Remove the parallelism limited Ninja alias and -# update and rebuild Chromium's source code. +# Update and rebuild Chromium's source code. RUN cd /home/user/chromium/src \ && git fetch origin \ && git reset --hard origin/master \ From ba664d72096b73e8cecb9d4f8f0d80a05190cc4b Mon Sep 17 00:00:00 2001 From: PhistucK Date: Thu, 24 May 2018 08:18:49 +0300 Subject: [PATCH 6/6] Added a TODO --- chromium/chromium.dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/chromium/chromium.dockerfile b/chromium/chromium.dockerfile index ef9588a..485b11a 100644 --- a/chromium/chromium.dockerfile +++ b/chromium/chromium.dockerfile @@ -7,6 +7,7 @@ RUN echo "\n# Add Chromium's depot_tools to the PATH." >> .bashrc \ && echo "export PATH=\"\$PATH:/home/user/depot_tools\"" >> .bashrc # Make default Ninja parallelism use 8 parallel jobs. +# TODO(phistuck) - remove this once host-level affinity settings are implemented. RUN echo "\nalias ninja='ninja -j8'" >> .bash_aliases # Enable bash completion for git cl.