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

Dockerfile

@@ -39,59 +39,30 @@ RUN git clone --depth 1 --branch v${b3d_vs_major}.${b3d_vs_minor} \
 RUN cd /opt/blender && make update
 RUN cd /opt/blender && make -j$(nproc)
 
-
-## 02. Collecte all dependencies
-FROM b3dock AS collector
-# Rassemble toutes les .so des precompiled libs dans un dossier plat
-# -not -type d  : ignore les dossiers
-# cp -P         : préserve les symlinks relatifs (libFoo.so -> libFoo.so.1.0)
-RUN mkdir -p /collected-libs && \
-    find /opt/blender/lib/linux_x64 \
-        -name "*.so*" \
-        -not -type d \
-        -exec cp -P {} /collected-libs/ \;
+# Check if this folder exist
+RUN ls /opt/build_linux/bin/
 
 
-## 03. Build optimissed image
+## 02. Build optimissed image
 ## Setup a Multistage optimisation
-FROM ubuntu:25.04
+FROM ubuntu:25.04 AS final
 
 RUN apt-get update && apt-get install -y \
-    libx11-6 \
+    libsm6 \
     libxi6 \
     libxxf86vm1 \
     libxrender1 \
-    libxrandr2 \
-    libxinerama1 \
-    libxcursor1 \
     libxfixes3 \
     libxkbcommon0 \
-    libwayland-client0 \
-    libwayland-egl1 \
-    libegl1 \
-    libgl1 \
-    libdbus-1-3 \
-    libxcb1 \
-    libtbb12 \
-    libopenal1 \
-    libsm6 \
-    libice6 \
-    && rm -rf /var/lib/apt/lists/*
+    libgl1
 
 RUN useradd -m -s /bin/bash bld
 
-COPY --from=b3dock /opt/build_linux/bin/blender /usr/local/bin/blender
-COPY --from=collector /collected-libs /usr/local/lib/blender
-
-RUN echo "/usr/local/lib/blender" > /etc/ld.so.conf.d/blender.conf \
-    && ldconfig
-
-ARG b3d_vs_major
-ENV B3D_ADDON_PATH="/home/bld/.config/blender/${b3d_vs_major}/scripts/addons"
-
 USER bld
-# Working Directory setup
-WORKDIR /home/bld
+COPY --from=b3dock /opt/build_linux/bin /opt/blender
 
-ENTRYPOINT ["/usr/local/bin/blender"]
-CMD ["--version"]
+# ARG b3d_vs_major
+# ENV B3D_ADDON_PATH="/home/bld/.config/blender/${b3d_vs_major}/scripts/addons"
+
+# Working Directory setup
+WORKDIR /opt/blender

README.md

@@ -1,5 +1,4 @@
 [![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
@@ -29,5 +28,16 @@ Call this function with blender inside this container
 
 # Check Image build
 ```shell
-docker run --rm stilobique/blender:5.1.2 blender --version
+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_minor": 1
-    },
-    {
-      "b3d_vs_major": 3.4,
-      "b3d_vs_minor": 0
-    },
-    {
-      "b3d_vs_major": 3.3,
+      "b3d_vs_major": 5.1,
       "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

entrypoint.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-LIB_PATHS="$(find /opt/blender-libs -type d -name lib | paste -sd: -)"
-export LD_LIBRARY_PATH="${LIB_PATHS}:${LD_LIBRARY_PATH}"
-
-exec /usr/local/bin/blender "$@"

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