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: addapt port api

Browse Source
This commit is contained in:
Xavier-Do 2024-02-28 13:22:46 +01:00
parent a00fa04e07
commit d339499e77
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runbot/container.py
View File

@ -133,7 +133,7 @@ def _docker_run(cmd=False, log_path=False, build_dir=False, container_name=False
This directory is shared as a volume with the container
:param container_name: used to give a name to the container for later reference
:param image_tag: Docker image tag name to select which docker image to use
:param exposed_ports: if not None, starting at 8069, ports will be exposed as exposed_ports numbers
:param exposed_ports: if not None, ports will be exposed as exposed_ports numbers
:param memory: memory limit in bytes for the container
:params ro_volumes: dict of dest:source volumes to mount readonly in builddir
:params env_variables: list of environment variables
@ -171,7 +171,7 @@ def _docker_run(cmd=False, log_path=False, build_dir=False, container_name=False
ports = {}
if exposed_ports:
for dp, hp in enumerate(exposed_ports, start=8069):
for dp, hp in exposed_ports.items():
ports[f'{dp}/tcp'] = ('127.0.0.1', hp)
ulimits = [docker.types.Ulimit(name='core', soft=0, hard=0)] # avoid core dump in containers

7
runbot/models/build_config.py
View File

@ -383,7 +383,12 @@ class ConfigStep(models.Model):
except Exception:
_logger.exception('An error occured while reloading nginx')
build._log('', "An error occured while reloading nginx, skipping")
return dict(cmd=cmd, container_name=docker_name, exposed_ports=[build_port, build_port + 1], ro_volumes=exports, env_variables=env_variables)
exposed_ports = {
build_port: 8069,
build_port + 1: 8070,
}
return dict(cmd=cmd, container_name=docker_name, exposed_ports=exposed_ports, ro_volumes=exports, env_variables=env_variables)
def _run_install_odoo(self, build):
exports = build._checkout()