hobbyhimmel/odoo-openupgrade-wizard
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Sylvain LE GAL 2022-04-27 15:46:05 +02:00
parent dce91df36d
commit ce886eccfc
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
odoo_openupgrade_wizard/cli_docker_build.py
View File

@ -1,11 +1,11 @@
import click import click
import docker
from loguru import logger from loguru import logger
from odoo_openupgrade_wizard.cli_options import ( from odoo_openupgrade_wizard.cli_options import (
get_odoo_versions_from_options, get_odoo_versions_from_options,
releases_options, releases_options,
) )
from odoo_openupgrade_wizard.tools_docker import get_docker_client
from odoo_openupgrade_wizard.tools_odoo import ( from odoo_openupgrade_wizard.tools_odoo import (
get_docker_image_tag, get_docker_image_tag,
get_odoo_env_path, get_odoo_env_path,
@ -18,7 +18,7 @@ from odoo_openupgrade_wizard.tools_odoo import (
def docker_build(ctx, releases): def docker_build(ctx, releases):
"""Build Odoo Docker Images. (One image per release)""" """Build Odoo Docker Images. (One image per release)"""
docker_client = docker.from_env() docker_client = get_docker_client()
for odoo_version in get_odoo_versions_from_options(ctx, releases): for odoo_version in get_odoo_versions_from_options(ctx, releases):
logger.info( logger.info(

8
odoo_openupgrade_wizard/tools_docker.py
View File

@ -2,6 +2,10 @@ import docker
from loguru import logger from loguru import logger
def get_docker_client():
return docker.from_env()
def run_container( def run_container(
image_name, image_name,
container_name, container_name,
@ -12,7 +16,7 @@ def run_container(
detach=False, detach=False,
auto_remove=False, auto_remove=False,
): ):
client = docker.from_env() client = get_docker_client()
logger.info("Launching Docker container named %s ..." % (image_name)) logger.info("Launching Docker container named %s ..." % (image_name))
debug_docker_command = "docker run --name %s\\\n" % (container_name) debug_docker_command = "docker run --name %s\\\n" % (container_name)
@ -61,7 +65,7 @@ def run_container(
def kill_container(container_name): def kill_container(container_name):
client = docker.from_env() client = get_docker_client()
containers = client.containers.list( containers = client.containers.list(
all=True, all=True,
filters={"name": container_name}, filters={"name": container_name},

4
tests/cli_B_02_docker_build_test.py
View File

@ -1,6 +1,6 @@
from pathlib import Path from pathlib import Path
import docker from odoo_openupgrade_wizard.tools_docker import get_docker_client
from . import cli_runner_invoke from . import cli_runner_invoke
@ -16,7 +16,7 @@ def test_cli_docker_build():
] ]
) )
docker_client = docker.from_env() docker_client = get_docker_client()
assert docker_client.images.get( assert docker_client.images.get(
"odoo-openupgrade-wizard-image__test-cli__14.0" "odoo-openupgrade-wizard-image__test-cli__14.0"

4
tests/cli_B_03_run_test.py
View File

@ -2,7 +2,7 @@ from pathlib import Path
from . import cli_runner_invoke from . import cli_runner_invoke
# import docker # from odoo_openupgrade_wizard.tools_docker import get_docker_client
def test_cli_run(): def test_cli_run():
@ -28,7 +28,7 @@ def test_cli_run():
# assert db_filestore_path.exists() # assert db_filestore_path.exists()
# # Ensure that all the containers are removed # # Ensure that all the containers are removed
# docker_client = docker.from_env() # docker_client = get_docker_client()
# assert not docker_client.containers.list( # assert not docker_client.containers.list(
# all=True, filters={"name": "odoo-openupgrade-wizard"} # all=True, filters={"name": "odoo-openupgrade-wizard"}
# ) # )