diff --git a/Dockerfile b/Dockerfile index a1916bb..0c08985 100644 --- a/Dockerfile +++ b/Dockerfile @@ -42,26 +42,8 @@ RUN cd /opt/blender && make -j$(nproc) # Check if this folder exist RUN ls /opt/build_linux/bin/ -### 02. Collecte all dependencies -#FROM b3dock AS collector -# -#RUN apt-get update && apt-get install -y \ -# binutils \ -# && rm -rf /var/lib/apt/lists/* -# -#COPY collect_deps.sh /usr/local/bin/collect_deps.sh -#RUN chmod +x /usr/local/bin/collect_deps.sh -# -#RUN collect_deps.sh /opt/build_linux/bin/blender /collected-libs -# -## Strip des symboles debug -#RUN find /collected-libs -name "*.so*" -not -type l \ -# -exec strip --strip-debug {} \; 2>/dev/null || true -# -#RUN strip --strip-debug /opt/build_linux/bin/blender 2>/dev/null || true - -## 03. Build optimissed image +## 02. Build optimissed image ## Setup a Multistage optimisation FROM ubuntu:25.04 AS final @@ -76,20 +58,11 @@ RUN apt-get update && apt-get install -y \ RUN useradd -m -s /bin/bash bld -#COPY --from=b3dock /opt/build_linux/bin/blender /usr/local/bin/blender +USER bld COPY --from=b3dock /opt/build_linux/bin /opt/blender -RUN ls -la /opt/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 /opt/blender - -#ENTRYPOINT ["/usr/local/bin"] -#CMD ["--version"] \ No newline at end of file diff --git a/README.md b/README.md index 66fdfd8..369575a 100644 --- a/README.md +++ b/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,19 +28,16 @@ Call this function with blender inside this container # Check Image build ```shell -docker run --rm stilobique/blender:5.1.2 --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 +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 /usr/local/bin/blender | grep "not found" || echo "All deps OK"' +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 \ - -b --python-expr "import bpy; print('OK:', bpy.app.version_string)" +docker run --rm stilobique/blender:5.1.2 ./blender -b --python-expr "import bpy; print('OK:', bpy.app.version_string)" ``` \ No newline at end of file