NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-15 23:45:44 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[IMP] runbot: allow to install Chrome from google

Browse Source 
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.
This commit is contained in:
Christophe Monniez 2021-03-09 11:35:25 +01:00
parent 50f803ec31
commit 6bd74c07c4
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
runbot/templates/dockerfile.xml
View File

@ -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">