diff --git a/runbot/__manifest__.py b/runbot/__manifest__.py index eab898c66..199b32d38 100644 --- a/runbot/__manifest__.py +++ b/runbot/__manifest__.py @@ -18,6 +18,8 @@ 'data/runbot_data.xml', 'data/runbot_error_regex_data.xml', 'data/website_data.xml', + 'data/runbot_config_parameters.xml', + "data/dockerfile_binaural.xml", 'security/runbot_security.xml', 'security/ir.model.access.csv', diff --git a/runbot/data/dockerfile_binaural.xml b/runbot/data/dockerfile_binaural.xml new file mode 100644 index 000000000..ee80c9d5f --- /dev/null +++ b/runbot/data/dockerfile_binaural.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + RUN set -x ; \ + apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends + && rm -rf /var/lib/apt/lists/* + + + + +# Install nodejs +RUN curl -sSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \ + && echo ""deb https://deb.nodesource.com/node_.x `lsb_release -c -s` main"" > /etc/apt/sources.list.d/nodesource.list \ + && apt-get update \ + && apt-get install -y nodejs + + + + RUN npm install -g + + + + ADD https://raw.githubusercontent.com/brendangregg/FlameGraph/master/flamegraph.pl /usr/local/bin/flamegraph.pl + RUN chmod +rx /usr/local/bin/flamegraph.pl + + + +ADD https://raw.githubusercontent.com/odoo/odoo//requirements.txt /root/requirements.txt +RUN -m pip install --no-cache-dir setuptools wheel && \ + -m pip install --no-cache-dir -r /root/requirements.txt && \ + -m pip install --no-cache-dir + + + + +RUN curl -sSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \ + && echo ""deb http://apt.postgresql.org/pub/repos/apt/ `lsb_release -s -c`-pgdg main"" > /etc/apt/sources.list.d/pgclient.list \ + && apt-get update \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y postgresql-client- \ + && rm -rf /var/lib/apt/lists/* + + + + diff --git a/runbot/data/runbot_config_parameters.xml b/runbot/data/runbot_config_parameters.xml new file mode 100644 index 000000000..92ac2ef63 --- /dev/null +++ b/runbot/data/runbot_config_parameters.xml @@ -0,0 +1,92 @@ + + + + + runbot.runbot_workers + 4 + + + runbot.runbot_running_max + 10 + + + runbot.runbot_timeout + 3600 + + + runbot.runbot_starting_port + 2000 + + + runbot.runbot_max_age + 30 + + + runbot.runbot_update_frequency + 300 + + + + + runbot.runbot_containers_memory + 4.0 + + + runbot.runbot_containers_cpus + 0.0 + + + + + runbot.runbot_do_fetch + True + + + + runbot.runbot_do_schedule + True + + + + False + + + + + runbot.logdb_name + runbot_logs + + + runbot.template + template1 + + + runbot.message + + + + runbot.default_odoorc + + + + + + runbot.upgrade_exception_message + + + + runbot.is_base_regex + ^base:.* + + + runbot.forwardport_author + Runbot <runbot@example.com> + + + runbot.organisation + MyOrg + + + diff --git a/runbot/data/runbot_data.xml b/runbot/data/runbot_data.xml index adef8dc3c..b4e99f720 100644 --- a/runbot/data/runbot_data.xml +++ b/runbot/data/runbot_data.xml @@ -19,15 +19,17 @@ runbot.runbot_upgrade_exception_message - Upgrade exception [#{exception.id}]({base_url}/web/#id={exception.id}&view_type=form&model=runbot.upgrade.exception) added\ - {exception.elements} + Upgrade exception + [#{exception.id}]({base_url}/web/#id={exception.id}&view_type=form&model=runbot.upgrade.exception) + added\ + {exception.elements} runbot.runbot_default_odoorc [options] -admin_passwd=running_master_password + admin_passwd=running_master_password @@ -37,11 +39,6 @@ admin_passwd=running_master_password - - runbot.runbot_disable_host_on_fetch_failure - - - runbot.runbot_dockerfile_public_by_default @@ -100,12 +97,12 @@ admin_passwd=running_master_password Runbot - + 10 seconds -1 - - + + model._cron() code