diff --git a/runbot/models/batch.py b/runbot/models/batch.py index 4e5f1d7e..5caff71a 100644 --- a/runbot/models/batch.py +++ b/runbot/models/batch.py @@ -135,7 +135,7 @@ class Batch(models.Model): if not bundle.version_id: _logger.error('No version found on bundle %s in project %s', bundle.name, project.name) - dockerfile_id = bundle.dockerfile_id or bundle.base_id.dockerfile_id or bundle.version_id.dockerfile_id + dockerfile_id = bundle.dockerfile_id or bundle.base_id.dockerfile_id or bundle.version_id.dockerfile_id or bundle.project_id.dockerfile_id if not dockerfile_id: _logger.error('No dockerfile found !') diff --git a/runbot/models/dockerfile.py b/runbot/models/dockerfile.py index 022f78e0..dc9fe0e5 100644 --- a/runbot/models/dockerfile.py +++ b/runbot/models/dockerfile.py @@ -20,6 +20,7 @@ class Dockerfile(models.Model): version_ids = fields.One2many('runbot.version', 'dockerfile_id', string='Versions') description = fields.Text('Description') view_ids = fields.Many2many('ir.ui.view', compute='_compute_view_ids') + project_ids = fields.One2many('runbot.project', 'dockerfile_id', string='Default for Projects') bundle_ids = fields.One2many('runbot.bundle', 'dockerfile_id', string='Used in Bundles') _sql_constraints = [('runbot_dockerfile_name_unique', 'unique(name)', 'A Dockerfile with this name already exists')] diff --git a/runbot/models/project.py b/runbot/models/project.py index 7ac9e99f..537b26f0 100644 --- a/runbot/models/project.py +++ b/runbot/models/project.py @@ -9,6 +9,7 @@ class Project(models.Model): group_ids = fields.Many2many('res.groups', string='Required groups') trigger_ids = fields.One2many('runbot.trigger', 'project_id', string='Triggers') + dockerfile_id = fields.Many2one('runbot.dockerfile', index=True, help="Project Default Dockerfile") class Category(models.Model): diff --git a/runbot/views/bundle_views.xml b/runbot/views/bundle_views.xml index add1c699..41e239b7 100644 --- a/runbot/views/bundle_views.xml +++ b/runbot/views/bundle_views.xml @@ -7,6 +7,7 @@
+ diff --git a/runbot/views/dockerfile_views.xml b/runbot/views/dockerfile_views.xml index 6a852e47..cdfb68f9 100644 --- a/runbot/views/dockerfile_views.xml +++ b/runbot/views/dockerfile_views.xml @@ -12,6 +12,7 @@ + @@ -59,6 +60,7 @@ +