File tree Expand file tree Collapse file tree 3 files changed +11
-2
lines changed Expand file tree Collapse file tree 3 files changed +11
-2
lines changed Original file line number Diff line number Diff line change @@ -159,7 +159,6 @@ RUN deluser ubuntu</field>
159159 <field name =" name" >Create user for docker default</field >
160160 <field name =" reference_docker_layer_id" ref =" runbot.docker_layer_create_user_template" />
161161 </record >
162-
163162 <record id =" runbot.docker_layer_switch_user" model =" runbot.docker_layer" >
164163 <field name =" sequence" eval =" 1020" />
165164 <field name =" dockerfile_id" ref =" runbot.docker_default" />
@@ -168,6 +167,14 @@ RUN deluser ubuntu</field>
168167 <field name =" content" >USER {USERNAME}</field >
169168 </record >
170169
170+ <record id =" runbot.docker_layer_odoo_runbot" model =" runbot.docker_layer" >
171+ <field name =" sequence" eval =" 1030" />
172+ <field name =" dockerfile_id" ref =" runbot.docker_default" />
173+ <field name =" layer_type" >raw</field >
174+ <field name =" name" >ENV ODOO_RUNBOT 1</field >
175+ <field name =" content" >ENV ODOO_RUNBOT 1</field >
176+ </record >
177+
171178 <record id =" runbot.docker_pip_break_system_packages" model =" runbot.docker_layer" >
172179 <field name =" sequence" eval =" 1100" />
173180 <field name =" dockerfile_id" ref =" runbot.docker_default" />
Original file line number Diff line number Diff line change @@ -7,6 +7,7 @@ class UpgradeExceptions(models.Model):
77 _name = 'runbot.upgrade.exception'
88 _description = 'Upgrade exception'
99 _inherit = ['mail.thread' , 'mail.activity.mixin' ]
10+ _mail_post_access = 'read'
1011
1112 active = fields .Boolean ('Active' , default = True , tracking = True )
1213 elements = fields .Text ('Elements' , required = True , tracking = True )
Original file line number Diff line number Diff line change @@ -72,7 +72,8 @@ def test_docker_default(self):
7272RUN python3 -m pip install --no-cache-dir ebaysdk==2.1.5 pdf417gen==0.7.1
7373ADD --chown=TestUser https://raw.githubusercontent.com/odoo/odoo/master/requirements.txt /tmp/requirements.txt
7474RUN python3 -m pip install --no-cache-dir -r /tmp/requirements.txt
75- USER TestUser""" , docker_render )
75+ USER TestUser
76+ ENV ODOO_RUNBOT 1""" , docker_render )
7677
7778 def test_dockerfile_base_fields (self ):
7879 dockerfile = self .env ['runbot.dockerfile' ].create ({
You can’t perform that action at this time.
0 commit comments