Add more debug/print info

Add clean dockers env.
Fix Dockerfile with the latest step.

.gitignore

@@ -1,3 +1,9 @@
+### Logs
+**/logs/**
+
+### Config/setup """
+*.env
+
 ### PyCharm ###
 .idea/
 

.gitlab-ci.yml

@@ -1,38 +0,0 @@
-cache:
-  key: blender-source
-  paths:
-    - /opt/blender-git/blender  # Blender git repository source
-    - /opt/blender-git/lib      # Blender Subversion lib package
-  policy: pull
-
-update-cache:
-  stage: .pre
-  cache:
-    key: blender-source
-  image: stilobique/csv:latest
-  script:
-    - mkdir -p /opt/blender-git/lib
-    - cd /opt/blender-git
-    - git clone https://projects.blender.org/blender/blender.git
-    - cd /opt/blender-git/blender
-    - git submodule update --init --recursive
-    - cd /opt/blender-git/lib
-    - svn checkout https://svn.blender.org/svnroot/bf-blender/trunk/lib/linux_centos7_x86_64
-
-build-dockerfile:
-  image: docker:19.03.12
-  rules:
-    - changes:
-        - build.json
-  stage: build
-  services:
-    - docker:dind
-  cache:
-    key: blender-source
-  script:
-    - apk add python3
-    - apk add py3-pip
-    - python3 -m pip install --upgrade pip
-    - python3 -m pip install -r requirement-build.txt
-    - python3 main.py
-    - python3 main.py --tag=latest

.idea/icon.svg

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   style="clip-rule:evenodd;fill-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2"
+   version="1.1"
+   viewBox="0 0 181 148"
+   xml:space="preserve"
+   id="svg4"
+   sodipodi:docname="blender-docker.svg"
+   inkscape:version="1.4.4 (dcaf3e7d9e, 2026-05-05)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
+   id="defs4" /><sodipodi:namedview
+   id="namedview4"
+   pagecolor="#505050"
+   bordercolor="#ffffff"
+   borderopacity="1"
+   inkscape:showpageshadow="0"
+   inkscape:pageopacity="0"
+   inkscape:pagecheckerboard="1"
+   inkscape:deskcolor="#505050"
+   inkscape:zoom="5.2541436"
+   inkscape:cx="90.404837"
+   inkscape:cy="74.036803"
+   inkscape:window-width="2648"
+   inkscape:window-height="1350"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="g4" />
+    <title
+   id="title1">Blender logo (without text)</title>
+    <g
+   transform="matrix(.281 0 0 .281 -41.8 -43.7)"
+   id="g4"
+   style="fill:#1c90ed;fill-opacity:1">
+        <g
+   transform="matrix(21.6 0 0 21.6 -4857 7665)"
+   id="g1"
+   style="fill:none;fill-opacity:1">
+            <path
+   d="m243-334c0.106-1.89 1.03-3.56 2.43-4.74 1.37-1.16 3.21-1.87 5.23-1.87 2.01 0 3.85 0.709 5.22 1.87 1.4 1.18 2.32 2.85 2.43 4.74 0.106 1.94-0.675 3.75-2.04 5.09-1.4 1.36-3.38 2.22-5.61 2.22s-4.22-0.854-5.61-2.22c-1.37-1.34-2.15-3.14-2.04-5.08z"
+   style="fill-rule:nonzero;fill:none;fill-opacity:1"
+   id="path1" />
+        </g>
+        <g
+   transform="matrix(11.1,0,0,11.1,-2215,4153)"
+   id="g3"
+   style="display:inline;fill:#1c90ed;fill-opacity:1">
+            <path
+   d="m 243,-334 c 0.106,-1.89 1.03,-3.56 2.43,-4.74 1.37,-1.16 3.21,-1.87 5.23,-1.87 2.01,0 3.85,0.709 5.22,1.87 1.4,1.18 2.32,2.85 2.43,4.74 0.106,1.94 -0.675,3.75 -2.04,5.09 -1.4,1.36 -3.38,2.22 -5.61,2.22 -2.23,0 -4.22,-0.854 -5.61,-2.22 -1.37,-1.34 -2.15,-3.14 -2.04,-5.08 z"
+   style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero"
+   id="path2" />
+            <path
+   d="m 231,-330 c 0.013,0.74 0.249,2.18 0.603,3.3 0.744,2.38 2.01,4.58 3.76,6.51 1.8,1.99 4.02,3.59 6.58,4.73 2.69,1.19 5.61,1.8 8.64,1.8 3.03,-0.004 5.95,-0.624 8.64,-1.83 2.56,-1.15 4.78,-2.75 6.58,-4.75 1.76,-1.95 3.02,-4.15 3.76,-6.53 0.375,-1.2 0.612,-2.42 0.707,-3.64 0.093,-1.2 0.054,-2.41 -0.117,-3.62 -0.334,-2.35 -1.15,-4.56 -2.4,-6.56 -1.14,-1.85 -2.62,-3.46 -4.38,-4.82 l 0.004,-0.003 -17.7,-13.6 c -0.016,-0.012 -0.029,-0.025 -0.046,-0.036 -1.16,-0.892 -3.12,-0.889 -4.39,0.005 -1.29,0.904 -1.44,2.4 -0.29,3.34 l -0.005,0.005 7.39,6.01 -22.5,0.024 h -0.03 c -1.86,0.002 -3.65,1.22 -4,2.77 -0.364,1.57 0.9,2.88 2.84,2.88 l -0.003,0.007 11.4,-0.022 -20.4,15.6 c -0.026,0.019 -0.054,0.039 -0.078,0.058 -1.92,1.47 -2.54,3.92 -1.33,5.46 1.23,1.57 3.84,1.58 5.78,0.009 l 11.1,-9.1 c 0,0 -0.162,1.23 -0.149,1.96 z m 28.6,4.11 c -2.29,2.33 -5.5,3.66 -8.96,3.66 -3.47,0.006 -6.68,-1.3 -8.97,-3.63 -1.12,-1.14 -1.94,-2.44 -2.45,-3.83 -0.497,-1.37 -0.69,-2.82 -0.562,-4.28 0.121,-1.43 0.547,-2.8 1.23,-4.03 0.668,-1.21 1.59,-2.31 2.72,-3.24 2.23,-1.81 5.06,-2.8 8.02,-2.8 2.97,-0.004 5.8,0.969 8.03,2.78 1.13,0.924 2.05,2.02 2.72,3.23 0.683,1.23 1.11,2.59 1.23,4.03 0.126,1.46 -0.067,2.91 -0.564,4.28 -0.508,1.4 -1.33,2.7 -2.45,3.84 z"
+   style="fill:#1c90ed;fill-opacity:1;fill-rule:nonzero"
+   id="path3" />
+        </g>
+    </g>
+<metadata
+   id="metadata4"><rdf:RDF><cc:Work
+       rdf:about=""><dc:title>Blender logo (without text)</dc:title></cc:Work></rdf:RDF></metadata></svg>

.run/Automation Builder.run.xml

@@ -1,6 +1,7 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Generate image" type="PythonConfigurationType" factoryName="Python">
+  <configuration default="false" name="Automation Builder" type="PythonConfigurationType" factoryName="Python">
-    <module name="blender-docker" />
+    <module name="rider.module" />
+    <option name="ENV_FILES" value="$PROJECT_DIR$/config.env" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
     <envs>
@@ -11,17 +12,8 @@
     <option name="IS_MODULE_SDK" value="true" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="DEBUG_JUST_MY_CODE" value="false" />
-    <EXTENSION ID="net.ashald.envfile">
+    <option name="RUN_TOOL" value="" />
-      <option name="IS_ENABLED" value="false" />
-      <option name="IS_SUBST" value="false" />
-      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
-      <option name="IS_IGNORE_MISSING_FILES" value="false" />
-      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
-      <ENTRIES>
-        <ENTRY IS_ENABLED="true" PARSER="runconfig" />
-      </ENTRIES>
-    </EXTENSION>
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/main.py" />
     <option name="PARAMETERS" value="" />
     <option name="SHOW_COMMAND_LINE" value="false" />

.run/Build BlenderDocker.run.xml

@@ -1,33 +1,26 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Dockerfile" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
+  <configuration default="false" name="Build BlenderDocker" type="docker-deploy" factoryName="dockerfile" server-name="Docker Desktop">
     <deployment type="dockerfile">
       <settings>
-        <option name="imageTag" value="stilobique/blender:3.4.0" />
+        <option name="imageTag" value="stilobique/blender:4.5.11" />
         <option name="buildArgs">
           <list>
             <DockerEnvVarImpl>
               <option name="name" value="b3d_vs_major" />
-              <option name="value" value="3.4" />
+              <option name="value" value="4.5" />
             </DockerEnvVarImpl>
             <DockerEnvVarImpl>
               <option name="name" value="b3d_vs_minor" />
-              <option name="value" value="0" />
+              <option name="value" value="11" />
             </DockerEnvVarImpl>
           </list>
         </option>
         <option name="buildOnly" value="true" />
         <option name="containerName" value="blender-latest" />
         <option name="sourceFilePath" value="Dockerfile" />
-        <option name="volumeBindings">
-          <list>
-            <DockerVolumeBindingImpl>
-              <option name="containerPath" value="/moderlab-plugin" />
-              <option name="hostPath" value="E:\Projects\Git\Blender-Moderlab-Config\addons\moderlab-plugin\moderlab-plugin" />
-            </DockerVolumeBindingImpl>
-          </list>
-        </option>
       </settings>
     </deployment>
+    <EXTENSION ID="com.jetbrains.rider.docker.debug" isFastModeEnabled="true" isSslEnabled="false" />
     <method v="2" />
   </configuration>
 </component>

.run/Clean docker Images .run.xml

@@ -0,0 +1,26 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Clean docker Images " type="PythonConfigurationType" factoryName="Python">
+    <module name="rider.module" />
+    <option name="ENV_FILES" value="" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <option name="DEBUG_JUST_MY_CODE" value="false" />
+    <option name="RUN_TOOL" value="" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/blender/misc.py" />
+    <option name="PARAMETERS" value="" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>

Dockerfile

@@ -1,59 +1,47 @@
-FROM ubuntu:22.04 AS blender
+FROM ubuntu:25.10 AS b3dock
 
 # Setup all software version request
-ARG b3d_vs_major=2.90
+ARG b3d_vs_major=5.2
 ARG b3d_vs_minor=0
-ARG subversion=63014
 
 LABEL Author="stilobique"
 LABEL Title="Blender Docker for Unit Test"
+LABEL Maintainer="Aurelien Vaillant contact@aurelien-vaillant.net"
 
-ENV TZ=Europe/Paris
+#ENV TZ=Europe/Paris
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+#RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
+## 01. Start First stage to build blender
 # Install dependencies
-RUN apt-get update && apt-get install -y \
+RUN apt-get update && apt-get install -y git git-lfs python3 sudo
-    build-essential \
-    gcc \
-    git \
-    cmake \
-    libc6-dev \
-    libx11-dev \
-    subversion \
-    libxrandr-dev \
-    libxcursor-dev \
-    libxxf86vm-dev \
-    libxinerama-dev \
-    libglew-dev \
-    libxi-dev \
-    python3
-
-# Debug
-RUN echo Build Blender v${b3d_vs_major}.${b3d_vs_minor}
-
-ADD . /opt/blender-git
 
 # Compile Blender
-RUN cd /opt/blender-git/ \
+RUN git clone --depth 1 --branch v${b3d_vs_major}.${b3d_vs_minor} \
-    && git checkout v${b3d_vs_major}.${b3d_vs_minor} \
+    https://projects.blender.org/blender/blender.git /opt/blender && \
-    && git config --global user.email "contact@aurelien-vaillant.net" \
+    chmod a+x /opt/blender/build_files/build_environment/install_linux_packages.py && \
-    && git config --global user.name "Aurelien Vaillant" \
+    python3 /opt/blender/build_files/build_environment/install_linux_packages.py
-    && mkdir /opt/blender-git/lib \
-    && cd /opt/blender-git/lib \
-    && svn checkout -r${subversion} \
-    && make
 
-# Setup a Multistage optimisation
+RUN cd /opt/blender &&  \
-FROM ubuntu:22.04
+    make update && \
-COPY --from=blender /opt/blender-git/build_linux/bin /opt/blender
+    make -j$(nproc)
-ARG b3d_vs_major
-ENV B3D_ADDON_PATH "$HOME/.config/blender/${b3d_vs_major}/scripts/addons"
 
-RUN apt-get update && apt-get install -y \
+
-    libxi6 \
+## 02. Build optimissed image
-    libxxf86vm1 \
+## Setup a Multistage optimisation
-    libxrender1 \
+FROM ubuntu:25.10 AS final
-    libgl1-mesa-glx
+
+#COPY --from=b3dock /opt/blender/build_files/build_environment/packages.txt /tmp/packages.txt
+COPY --from=b3dock /opt/blender/build_files/build_environment/install_linux_packages.py /tmp/install_linux_packages.py
+RUN apt-get update && apt-get install -y python3 sudo
+RUN python3 /tmp/install_linux_packages.py
+
+RUN useradd -m -s /bin/bash bld
+
+USER bld
+COPY --from=b3dock /opt/build_linux/bin /opt/blender
+
+# ARG b3d_vs_major
+# ENV B3D_ADDON_PATH="/home/bld/.config/blender/${b3d_vs_major}/scripts/addons"
 
 # Working Directory setup
-WORKDIR /
+WORKDIR /opt/blender

README.md

@@ -1,10 +1,8 @@
-[![Blender](https://img.shields.io/badge/blender-3.0.0-%23F5792A.svg?style=flat&logo=blender&logoColor=white)](https://www.blender.org/download/)
+[![Blender](https://img.shields.io/badge/blender-5.1.2-%23F5792A.svg?style=flat&logo=blender&logoColor=white)](https://www.blender.org/download/)
-[![pipeline status](https://gitlab.com/stilobique/blender-docker/badges/main/pipeline.svg)](https://gitlab.com/stilobique/blender-docker/-/commits/main)  
 
 
 # Blender Docker
-This repository is an automated blender docker image file generated, it's usefully with blender addon unit test. To 
+This repository is an automated blender docker image file generated, it's usefully with blender addon unit test.
-build a new specific image, you need to update the `build.json` file with the new version witched ; or 
 
 
 # Adding an Addon
@@ -25,4 +23,20 @@ Call this function with blender inside this container
 ````shell
 #!/bin/sh
 /opt/blender/blender --background --python "install.py"
-````
+````
+
+# Check Image build
+```shell
+docker run --rm stilobique/blender:5.1.2 ./blender --version
+```
+
+```shell
+# Taille de l'image
+docker image inspect stilobique/blender:5.1.2 --format='{{.Size}}' | numfmt --to=iec
+
+# Dépendances manquantes
+docker run --rm --entrypoint /bin/bash stilobique/blender:5.1.2 -c 'ldd /opt/blender/blender | grep "not found" || echo "All deps OK"'
+
+# Test fonctionnel
+docker run --rm stilobique/blender:5.1.2 ./blender -b --python-expr "import bpy; print('OK:', bpy.app.version_string)"
+```

blender/docker.py

@@ -0,0 +1,151 @@
+import os
+import docker
+import logging
+
+from .version import BlenderVersion
+from pathlib import Path
+from docker.errors import BuildError, APIError, ContainerError, ImageNotFound
+
+
+class BlenderDocker:
+    def __init__(self, blender: BlenderVersion, severity: int = logging.WARNING):
+        self._blender_version = blender
+        # Todo get a user config
+        self._docker_client = docker.DockerClient(base_url=f'unix:///var/run/docker.sock')
+        self.login()
+        self._docker_image = None
+        self._repository = 'stilobique/blender'
+        self._docker_image_name = self._blender_version.format_to_tag(self._repository)
+        
+        self._docker_file = Path(os.getcwd(), 'Dockerfile')
+        if not self._docker_file.exists():
+            print(f'Dockerfile not found: {self._docker_file}')
+            exit(1)
+        
+        self._args = {
+            'b3d_vs_major': f'{self._blender_version.major}',
+            'b3d_vs_minor': f'{self._blender_version.minor}.{self._blender_version.hotfix}',
+        }
+        
+        self._severity = severity
+        
+    def _get_logger(self, name: str) -> logging.Logger:
+        """
+        Private Method to set a logger for a specific method set (by his name)
+        :param name: Make the logger file name.
+        :return: 
+        """
+        log_dir = Path('logs')
+        log_dir.mkdir(parents=True, exist_ok=True)
+        
+        logger = logging.getLogger(f'blender_docker.{name}')
+        logger.setLevel(self._severity)
+        logger.propagate = False
+
+        if not logger.handlers:
+            handler = logging.FileHandler(log_dir / f'{name}.log')
+            handler.setFormatter(logging.Formatter(
+                '%(asctime)s | [%(levelname)s] %(message)s'
+            ))
+            logger.addHandler(handler)
+        
+        return logger
+
+    def login(self):
+        """Login to the Docker Hub"""
+        try:
+            print('Login to Hub Docker.')
+            self._docker_client.login(
+                username=os.environ['DOCKER_HUB_USER'],
+                password=os.environ['DOCKER_HUB_PASSWORD']
+            )
+            
+        except APIError as e:
+            print(f'Login failed with error: {e}')
+            exit(1)
+        
+    def build(self):
+        """Build the Blender Docker Image"""
+        logger = self._get_logger('build')
+        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(
+                path=os.getcwd(),
+                # nocache=True,
+                buildargs=self._args,
+                tag=self._docker_image_name, 
+                quiet=False,
+                rm=True,
+                forcerm=True
+            )
+            
+            # Debug log:
+            for chunk in build_logs:
+                if 'stream' in chunk:
+                    line = chunk['stream'].strip()
+                    if line:
+                        logger.debug(line)
+                        
+                elif 'error' in chunk:
+                    logger.error(chunk['error'])
+                
+        
+        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
+    def tag(self):
+        print('\tSet Tags version and/or Latest')
+        pass
+    
+    def test(self):
+        """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."""
+        logger = self._get_logger('test')
+        try:
+            print('Testing your Blender Docker image')
+            logger.info('Testing your Blender Docker image')
+            
+            test = self._docker_client.containers.run(
+                name=f"Blender-Docker-Testing-{self._blender_version.tag_name_slugify()}",
+                image=self._docker_image_name,
+                command=['./blender', '--version'],
+                auto_remove = True,
+                remove=True,
+                detach=True,
+                stdout=True
+            )
+            
+            print(f'\tResult: {test.logs()}')
+            
+            return True
+            
+        except ContainerError as e:
+            print(f'Container error: {e}')
+            exit(1)
+            
+        except ImageNotFound as e:
+            print(f'Image not found: {e}')
+            exit(1)
+            
+        except APIError as e:
+            print(f'API error: {e}')
+            for line in e.build_log:
+                if 'stream' in line:
+                    print(line['stream'].strip())
+            exit(1)
+        
+    def push(self):
+        self._docker_client.images.push(
+            repository=self._repository,
+            tag=self._blender_version.tag_name(),
+            stream=True,
+        )
+        

blender/misc.py

@@ -0,0 +1,79 @@
+import logging
+import os
+import json
+
+from pathlib import Path
+from subprocess import run, CalledProcessError
+
+# def clean_all_dockers():
+#     # bash docker context use default && docker system prune -a -f
+#     # bash docker context use podman && docker system prune -a -f
+#     # bash docker context use desktop-linux && docker system prune -a -f
+#     docker_client = docker.DockerClient(base_url=f'unix:///var/run/docker.sock')
+
+
+def clean_all_dockers():
+    """
+    Nettoie Docker pour tous les contextes disponibles (default, podman, ...).
+    Equivalent a, pour chaque contexte :
+        docker context use <context>
+        docker system prune -a -f
+    Puis remet le contexte d'origine en place a la fin.
+    """
+    logs_dir = Path(os.getcwd(), 'logs')
+    logs_dir.mkdir(parents=True, exist_ok=True)
+
+    logger = logging.getLogger('blender_docker.clean')
+    logger.setLevel(logging.DEBUG)
+    logger.propagate = False
+    if not logger.handlers:
+        handler = logging.FileHandler(logs_dir / 'clean.log')
+        handler.setFormatter(logging.Formatter(
+            '%(asctime)s|%(name)s [%(levelname)s] %(message)s'
+        ))
+        logger.addHandler(handler)
+
+    # Contexte courant, pour le restaurer a la fin
+    original_context = run(
+        ['docker', 'context', 'show'],
+        capture_output=True, text=True, check=True
+    ).stdout.strip()
+    logger.info(f'Contexte d\'origine: {original_context}')
+
+    # Liste de tous les contextes disponibles (format json, un objet par ligne)
+    contexts_raw = run(
+        ['docker', 'context', 'ls', '--format', '{{json .}}'],
+        capture_output=True, text=True, check=True
+    ).stdout.strip().splitlines()
+    contexts = [json.loads(line)['Name'] for line in contexts_raw if line]
+
+    print(f'\tContextes trouves: {contexts}')
+    logger.info(f'Contextes trouves: {contexts}')
+
+    for context in contexts:
+        try:
+            print(f'\tNettoyage du contexte: {context}')
+            logger.info(f'Nettoyage du contexte: {context}')
+
+            run(['docker', 'context', 'use', context], check=True)
+
+            result = run(
+                ['docker', 'system', 'prune', '-a', '-f'],
+                capture_output=True, text=True, check=True
+            )
+
+            print(f'\t{result.stdout.strip()}')
+            logger.info(result.stdout.strip())
+
+        except CalledProcessError as e:
+            print(f'\tErreur sur le contexte {context}: {e.stderr.strip()}')
+            logger.error(f'Erreur sur le contexte {context}: {e.stderr.strip()}')
+
+    # On remet le contexte d'origine
+    run(['docker', 'context', 'use', original_context], check=True)
+    print(f'\tContexte restaure: {original_context}')
+    logger.info(f'Contexte restaure: {original_context}')
+
+
+if __name__ == '__main__':
+    clean_all_dockers()

blender/version.py

@@ -0,0 +1,33 @@
+
+
+class BlenderVersion:
+    def __init__(self, version: str = '5.1.0'):
+        """
+        Need an object like 'X.Y.Z' to work correctly, build a pythonic object about a blender version.
+        :param version: 
+        """
+        self.major : str = ''
+        self.minor : str = ''
+        self.hotfix : str = ''
+        self.version_object(version)
+
+    def version_object(self, version: str):
+        """Set all version properties to a string"""
+        version = version.split('.')
+        self.major = version[0]
+        self.minor = version[1]
+        self.hotfix = version[2]
+        
+    def format_to_tag(self, repository: str) -> str:
+        """From version information, format to return a string"""
+        return f'{repository}:{self.major}.{self.minor}.{self.hotfix}'
+    
+    def tag_name(self) -> str:
+        """Return the tag name 'latest', 'X.Y.Z'..."""
+        return f'{self.major}.{self.minor}.{self.hotfix}'
+    
+    def tag_name_slugify(self):
+        return f'{self.major}-{self.minor}-{self.hotfix}'
+        
+    def __str__(self):
+        return str(self.major + '.' + self.minor + '.' + self.hotfix)

build.json

@@ -1,40 +0,0 @@
-{
-  "tags":
-  [{
-      "b3d_vs_major": 3.4,
-      "b3d_vs_minor": 1
-    },
-    {
-      "b3d_vs_major": 3.4,
-      "b3d_vs_minor": 0
-    },
-    {
-      "b3d_vs_major": 3.3,
-      "b3d_vs_minor": 2
-    },
-    {
-      "b3d_vs_major": 3.3,
-      "b3d_vs_minor": 1
-    },
-    {
-      "b3d_vs_major": 3.3,
-      "b3d_vs_minor": 0
-    },
-    {
-      "b3d_vs_major": 3.2,
-      "b3d_vs_minor": 1
-    },
-    {
-      "b3d_vs_major": 3.2,
-      "b3d_vs_minor": 0
-    },
-    {
-      "b3d_vs_major": 3.1,
-      "b3d_vs_minor": 2
-    },
-    {
-      "b3d_vs_major": 3.1,
-      "b3d_vs_minor": 0
-    }
-  ]
-}

image/Dockerfile-csv

@@ -1,7 +0,0 @@
-FROM alpine AS csv
-
-LABEL Author="stilobique"
-LABEL Title="Linux image with subversion and git"
-
-# Install dependencies
-RUN apk add git && apk add subversion

main.py

@@ -1,65 +1,25 @@
-import os
+from logging import INFO
-import pathlib
-import json
-import docker
-import sys
 
-# TODO Update readme file badge with blender version
+from blender.version import BlenderVersion
-# TODO add a check if the image build are stored in the docker register
+from blender.docker import BlenderDocker
 
-
+# Todo Update readme file badge with blender version
-def get_data_from_json() -> (str, str):
-    """From the json file, get blender version (major and minor), and return this information."""
-    file = pathlib.Path(os.getcwd(), 'build.json')
-
-    with open(file, 'r') as f:
-        data = json.load(f)
-        f.close()
-
-    version_values = data['tags'][0]
-    major, minor = version_values['b3d_vs_major'], version_values['b3d_vs_minor']
-
-    return major, minor
-
-
-def build_docker(b3d_version: (str, str), latest: bool = False):
-    """
-    Generate docker image, request the blender version (major, minor) with the keyword b3d_version, and can be
-    tagged with latest or only blender version info.
-    """
-    client = docker.from_env()
-    if os.environ.get('docker_hub_password'):
-        client.login(username=os.environ['docker_hub_user'], password=os.environ['docker_hub_password'])
-
-    # Init all data to build the docker image
-    args = {
-        'b3d_vs_major': str(b3d_version[0]),
-        'b3d_vs_minor': str(b3d_version[1]),
-    }
-    docker_repo = 'stilobique/blender'
-    if latest:
-        tag = 'latest'
-    else:
-        tag = f'{args["b3d_vs_major"]}.{args["b3d_vs_minor"]}'
-    completed_tag_name = f'{docker_repo}:{args["b3d_vs_major"]}.{args["b3d_vs_minor"]}'
-
-    print('\t1 -> Build from image file')
-    client.images.build(path=os.getcwd(), buildargs=args, tag=completed_tag_name, rm=True, forcerm=True)
-
-    print(f'\t2 -> Push the new images with tag {tag}')
-    push = client.images.push(repository=docker_repo, tag=tag, stream=True)
-    print(f'\t\tDebug push :\n\t\t{push}')
 
 
 if __name__ == "__main__":
-    version = get_data_from_json()
+    # Todo use the manual entry can be error prone (need to make a basic regex to check this entry)
-    print(f'Start -> Setup the package with blender version "{version[0]}.{version[1]}"')
+    version = BlenderVersion(input("Give the blender version (X.Y.Z): "))
-    for arg in sys.argv:
+
-        if '--tag=' in arg:
+    print(f"Build a blender version {version}.")
-            print(f'Build with the tag "{arg}".')
+    docker = BlenderDocker(blender=version, severity=INFO)
-            build_docker(b3d_version=version, latest=True)
+    docker.build()
-            break
+    
-        else:
+    print('Test your image.')
-            build_docker(b3d_version=version)
+    test = docker.test()
-            print(f'Start to build the docker file.')
+    
-            pass
+    if test:
+        print('Push this image.')
+        docker.push()
+        
+        # Todo: Add a latest tag, check if this version are the latest
+        # Todo: Add a LTS tag, check if this version are a LTS

requirement-build.txt

@@ -1 +0,0 @@
-docker

requirements.txt

@@ -0,0 +1 @@
+docker==7.2.0

scripts/gen_packages_txt.py

@@ -0,0 +1,31 @@
+#!/usr/bin/env python3
+"""
+Lit install_linux_packages.py et génère un fichier .txt avec les paquets
+Debian/Ubuntu à installer.
+"""
+import re
+import sys
+
+READER="install_linux_packages.py"
+OUT="packages.txt"
+
+
+def main():
+    with open(READER, "r", encoding="utf-8") as f:
+        content = f.read()
+
+    # Cherche toutes les lignes du type: DISTRO_ID_DEBIAN: "nom-du-paquet"
+    packages = re.findall(r'DISTRO_ID_DEBIAN:\s*"([^"]+)"', content)
+
+    # Enlève les doublons, trie
+    packages = sorted(set(packages))
+
+    with open(OUT, "w", encoding="utf-8") as f:
+        for pkg in packages:
+            f.write(pkg + "\n")
+
+    print(f"{len(packages)} paquets écrits dans {OUT}")
+
+
+if __name__ == "__main__":
+    main()