From 6bd74c07c4f63024d5b6882eeba7cbc40f5bad58 Mon Sep 17 00:00:00 2001
From: Christophe Monniez <moc@odoo.com>
Date: Tue, 9 Mar 2021 11:35:25 +0100
Subject: [PATCH] [IMP] runbot: allow to install Chrome from google

When choosing to install Chrome in a Dockerfile, the chrome version is
downloaded from Odoo nightly server. This make it difficult to test
with different versions of Chrome.

With this commit, we allow to install from Google in Docker files.

By default, the install remains from Odoo Nightly server but if the key
`custom_values['chrome_source']` is set to 'google' in a Dockerfile,
the specified version will be downloaded from Google servers when the
Docker image is built.
---
 runbot/templates/dockerfile.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/runbot/templates/dockerfile.xml b/runbot/templates/dockerfile.xml
index c716e960..eed20aa8 100644
--- a/runbot/templates/dockerfile.xml
+++ b/runbot/templates/dockerfile.xml
@@ -19,12 +19,21 @@ RUN set -x ; \
     <template id="runbot.docker_install_chrome">
       <t t-set="chrome_distrib" t-value="values['chrome_distrib']"/>
       <t t-set="chrome_version" t-value="values['chrome_version']"/>
+      <t t-set="chrome_source" t-value="values.get('chrome_source')"/>
 # Install Google Chrome
+      <t t-if="chrome_source == 'google'">
+RUN curl -sSL https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_<t t-esc="chrome_version"/>_amd64.deb -o /tmp/chrome.deb \
+    &amp;&amp; apt-get update \
+    &amp;&amp; apt-get -y install --no-install-recommends /tmp/chrome.deb \
+    &amp;&amp; rm /tmp/chrome.deb
+      </t>
+      <t t-else="">
 RUN curl -sSL http://nightly.odoo.com/odoo.key | apt-key add - \
     &amp;&amp; echo "deb http://nightly.odoo.com/deb/<t t-esc="chrome_distrib"/> ./" > /etc/apt/sources.list.d/google-chrome.list \
     &amp;&amp; apt-get update \
     &amp;&amp; apt-get install -y -qq google-chrome-stable=<t t-esc="chrome_version"/> \
     &amp;&amp; rm -rf /var/lib/apt/lists/*
+      </t>
     </template>
 
     <template id="runbot.docker_install_phantomjs">