Clear old files

.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

.run/Build BlenderDocker.run.xml

@@ -1,20 +1,21 @@
 <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">
     <deployment type="dockerfile">
       <settings>
-        <option name="imageTag" value="stilobique/blender:3.4.0" />
+        <option name="imageTag" value="stilobique/blender:5.1.2" />
         <option name="buildArgs">
           <list>
             <DockerEnvVarImpl>
               <option name="name" value="b3d_vs_major" />
-              <option name="value" value="3.4" />
+              <option name="value" value="5.1" />
             </DockerEnvVarImpl>
             <DockerEnvVarImpl>
               <option name="name" value="b3d_vs_minor" />
-              <option name="value" value="0" />
+              <option name="value" value="2" />
             </DockerEnvVarImpl>
           </list>
         </option>
+        <option name="buildCliOptions" value="--debug" />
         <option name="buildOnly" value="true" />
         <option name="containerName" value="blender-latest" />
         <option name="sourceFilePath" value="Dockerfile" />
@@ -28,6 +29,7 @@
         </option>
       </settings>
     </deployment>
+    <EXTENSION ID="com.jetbrains.rider.docker.debug" isFastModeEnabled="true" isSslEnabled="false" />
     <method v="2" />
   </configuration>
 </component>

Dockerfile

@@ -1,59 +1,68 @@
-FROM ubuntu:22.04 AS blender
+FROM ubuntu:25.04 AS b3dock
 
 # Setup all software version request
-ARG b3d_vs_major=2.90
+ARG b3d_vs_major=5.1
 ARG b3d_vs_minor=0
-ARG subversion=63014
 
 LABEL Author="stilobique"
 LABEL Title="Blender Docker for Unit Test"
 
-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 \
-    build-essential \
-    gcc \
     git \
-    cmake \
+    git-lfs \
-    libc6-dev \
+    python3 \
-    libx11-dev \
+    build-essential \
     subversion \
-    libxrandr-dev \
+    cmake \
-    libxcursor-dev \
+    libx11-dev \
     libxxf86vm-dev \
-    libxinerama-dev \
+    libxcursor-dev \
-    libglew-dev \
     libxi-dev \
-    python3
+    libxrandr-dev \
-
+    libxinerama-dev \
-# Debug
+    libegl-dev \
-RUN echo Build Blender v${b3d_vs_major}.${b3d_vs_minor}
+    libwayland-dev \
-
+    wayland-protocols \
-ADD . /opt/blender-git
+    libxkbcommon-dev \
+    libdbus-1-dev \
+    linux-libc-dev
 
 # 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" \
-    && git config --global user.name "Aurelien Vaillant" \
-    && mkdir /opt/blender-git/lib \
-    && cd /opt/blender-git/lib \
-    && svn checkout -r${subversion} \
-    && make
     
-# Setup a Multistage optimisation
+RUN cd /opt/blender && make update
-FROM ubuntu:22.04
+RUN cd /opt/blender && make -j$(nproc)
-COPY --from=blender /opt/blender-git/build_linux/bin /opt/blender
+
-ARG b3d_vs_major
+# Check if this folder exist
-ENV B3D_ADDON_PATH "$HOME/.config/blender/${b3d_vs_major}/scripts/addons"
+RUN ls /opt/build_linux/bin/
+
+
+## 02. Build optimissed image
+## Setup a Multistage optimisation
+FROM ubuntu:25.04 AS final
 
 RUN apt-get update && apt-get install -y \
+    libsm6 \
     libxi6 \
     libxxf86vm1 \
     libxrender1 \
-    libgl1-mesa-glx
+    libxfixes3 \
+    libxkbcommon0 \
+    libgl1
+
+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,5 +1,4 @@
-[![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
@@ -26,3 +25,19 @@ Call this function with blender inside this container
 #!/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)"
+```

build.json

@@ -1,40 +1,8 @@
 {
   "tags":
   [{
-      "b3d_vs_major": 3.4,
+      "b3d_vs_major": 5.1,
-      "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
     }
   ]
 }

build.yaml

@@ -0,0 +1,2 @@
+- major: 5.1
+  minor: 2

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