Make a basic setup with invoke.
Fix log information. Remove unused script file.
This commit is contained in:
+69
-26
@@ -1,12 +1,24 @@
|
||||
import os
|
||||
import re
|
||||
import docker
|
||||
import logging
|
||||
import datetime
|
||||
|
||||
from .version import BlenderVersion
|
||||
from .dependency import BlenderDependency
|
||||
from pathlib import Path
|
||||
from docker.errors import BuildError, APIError, ContainerError, ImageNotFound
|
||||
|
||||
|
||||
_ANSI_ESCAPE_RE = re.compile(r'\x1b\[[0-9;]*[a-zA-Z]')
|
||||
|
||||
|
||||
def _clean_log_line(text: str) -> str:
|
||||
"""Strip ANSI escape codes and keep only the last update of a \r-rewritten line."""
|
||||
text = _ANSI_ESCAPE_RE.sub('', text)
|
||||
return text.split('\r')[-1].strip()
|
||||
|
||||
|
||||
class BlenderDocker:
|
||||
def __init__(self, blender: BlenderVersion, severity: int = logging.WARNING):
|
||||
self._blender_version = blender
|
||||
@@ -21,10 +33,13 @@ class BlenderDocker:
|
||||
if not self._docker_file.exists():
|
||||
print(f'Dockerfile not found: {self._docker_file}')
|
||||
exit(1)
|
||||
|
||||
self._packages = BlenderDependency(blender)
|
||||
|
||||
self._args = {
|
||||
'b3d_vs_major': f'{self._blender_version.major}',
|
||||
'b3d_vs_minor': f'{self._blender_version.minor}.{self._blender_version.hotfix}',
|
||||
'b3d_dependency': self._packages.__str__()
|
||||
}
|
||||
|
||||
self._severity = severity
|
||||
@@ -66,39 +81,56 @@ class BlenderDocker:
|
||||
|
||||
def build(self):
|
||||
"""Build the Blender Docker Image"""
|
||||
logger = self._get_logger('build')
|
||||
time = datetime.datetime.now()
|
||||
logger = self._get_logger(f'build-{time.strftime("%Y-%m-%d-%H-%M")}')
|
||||
collected_logs = []
|
||||
try:
|
||||
print('Building Blender Docker Image')
|
||||
logger.info('Building Blender Docker Image')
|
||||
logger.info(f'\tBuilds withs args: {self._args}')
|
||||
logger.info(f'\tTag generate: {self._docker_image_name}')
|
||||
|
||||
self._docker_image, build_logs = self._docker_client.images.build(
|
||||
|
||||
# Use the low-level API: images.build() only returns once the whole
|
||||
# build is finished, so it gives no live progress. api.build() with
|
||||
# decode=True streams each step (including cache hits) as it happens.
|
||||
build_logs = self._docker_client.api.build(
|
||||
path=os.getcwd(),
|
||||
# nocache=True,
|
||||
buildargs=self._args,
|
||||
tag=self._docker_image_name,
|
||||
quiet=False,
|
||||
tag=self._docker_image_name,
|
||||
rm=True,
|
||||
forcerm=True
|
||||
forcerm=True,
|
||||
decode=True,
|
||||
)
|
||||
|
||||
# Debug log:
|
||||
|
||||
for chunk in build_logs:
|
||||
collected_logs.append(chunk)
|
||||
|
||||
if 'stream' in chunk:
|
||||
line = chunk['stream'].strip()
|
||||
if line:
|
||||
logger.debug(line)
|
||||
|
||||
for raw_line in chunk['stream'].split('\n'):
|
||||
line = _clean_log_line(raw_line)
|
||||
if not line:
|
||||
continue
|
||||
if 'Using cache' in line:
|
||||
line = f'[CACHE] {line}'
|
||||
logger.info(line)
|
||||
|
||||
elif 'status' in chunk:
|
||||
status = _clean_log_line(chunk['status'])
|
||||
progress = _clean_log_line(chunk.get('progress', ''))
|
||||
line = f"{status} {chunk.get('id', '')} {progress}".strip()
|
||||
if 'Already exists' in status:
|
||||
line = f'[CACHE] {line}'
|
||||
logger.info(line)
|
||||
|
||||
elif 'error' in chunk:
|
||||
logger.error(chunk['error'])
|
||||
|
||||
|
||||
raise BuildError(chunk['error'], collected_logs)
|
||||
|
||||
self._docker_image = self._docker_client.images.get(self._docker_image_name)
|
||||
|
||||
except BuildError as e:
|
||||
logger.exception(f'Build docker image failed: {e}')
|
||||
for line in e.build_log:
|
||||
if 'stream' in line:
|
||||
logger.debug(line['stream'].strip())
|
||||
raise
|
||||
|
||||
@staticmethod
|
||||
@@ -108,20 +140,23 @@ class BlenderDocker:
|
||||
|
||||
def test(self) -> bool:
|
||||
"""
|
||||
This method request an image (call the method build before) and try to execute the blender inside the container
|
||||
This method request an image (call the method build before) and try to execute the blender inside the container
|
||||
to check if the program can be correctly executed.
|
||||
Based on `docker run --rm stilobique/blender:5.1.2 ./blender --version`
|
||||
:return: True if no issue are returned
|
||||
"""
|
||||
logger = self._get_logger('test')
|
||||
container_name = f"Blender-Docker-Testing-{self._blender_version.tag_name_slugify()}"
|
||||
command = ['./blender', '--version']
|
||||
try:
|
||||
print(f'Testing your Blender Docker image {self._docker_image_name}')
|
||||
logger.info(f'Testing your Blender Docker image {self._docker_image_name}.')
|
||||
logger.info(f'Testing image "{self._docker_image_name}" in container "{container_name}" '
|
||||
f'with command: {" ".join(command)}')
|
||||
|
||||
test = self._docker_client.containers.run(
|
||||
name=f"Blender-Docker-Testing-{self._blender_version.tag_name_slugify()}",
|
||||
name=container_name,
|
||||
image=self._docker_image_name,
|
||||
command=['./blender', '--version'],
|
||||
command=command,
|
||||
auto_remove=True,
|
||||
remove=True,
|
||||
detach=True,
|
||||
@@ -132,24 +167,32 @@ class BlenderDocker:
|
||||
result = test.wait()
|
||||
exit_code = result.get('StatusCode')
|
||||
|
||||
logger.info(f'Exit code return: {exit_code}')
|
||||
logger.info(test.logs(stdout=True, stderr=True).decode('utf-8', errors='replace').strip())
|
||||
container_logs = test.logs(stdout=True, stderr=True).decode('utf-8', errors='replace').strip()
|
||||
for raw_line in container_logs.split('\n'):
|
||||
line = _clean_log_line(raw_line)
|
||||
if line:
|
||||
logger.info(f'[container] {line}')
|
||||
|
||||
if exit_code == 0:
|
||||
logger.info(f'Test succeeded (exit code {exit_code}) for image "{self._docker_image_name}".')
|
||||
return True
|
||||
|
||||
logger.error(f'Test failed (exit code {exit_code}) for image "{self._docker_image_name}".')
|
||||
print(f'Testing your Blender Docker image {self._docker_image_name} failed.')
|
||||
return False
|
||||
|
||||
|
||||
except ContainerError as e:
|
||||
logger.exception(f'Container error while testing "{self._docker_image_name}": {e}')
|
||||
print(f'Container error: {e}')
|
||||
exit(1)
|
||||
|
||||
|
||||
except ImageNotFound as e:
|
||||
logger.exception(f'Image "{self._docker_image_name}" not found: {e}')
|
||||
print(f'Image not found: {e}')
|
||||
exit(1)
|
||||
|
||||
|
||||
except APIError as e:
|
||||
logger.exception(f'API error while testing "{self._docker_image_name}": {e}')
|
||||
print(f'API error: {e}')
|
||||
for line in e.build_log:
|
||||
if 'stream' in line:
|
||||
|
||||
Reference in New Issue
Block a user