diff --git a/.run/Build BlenderDocker.run.xml b/.run/Build BlenderDocker.run.xml index bf35d50..115ee12 100644 --- a/.run/Build BlenderDocker.run.xml +++ b/.run/Build BlenderDocker.run.xml @@ -1,32 +1,23 @@ - + - - diff --git a/.run/Generate image.run.xml b/.run/Generate image.run.xml deleted file mode 100644 index 85e76e6..0000000 --- a/.run/Generate image.run.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 0c08985..23e15e9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,60 +1,39 @@ -FROM ubuntu:25.04 AS b3dock +FROM python:latest AS b3dock # Setup all software version request -ARG b3d_vs_major=5.1 +ARG b3d_vs_major=5.2 ARG b3d_vs_minor=0 LABEL Author="stilobique" LABEL Title="Blender Docker for Unit Test" +LABEL maintainer="Aurelien Vaillant contact@aurelien-vaillant.net" #ENV TZ=Europe/Paris #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 \ - git \ - git-lfs \ - python3 \ - build-essential \ - subversion \ - cmake \ - libx11-dev \ - libxxf86vm-dev \ - libxcursor-dev \ - libxi-dev \ - libxrandr-dev \ - libxinerama-dev \ - libegl-dev \ - libwayland-dev \ - wayland-protocols \ - libxkbcommon-dev \ - libdbus-1-dev \ - linux-libc-dev +RUN apt-get update && apt-get install -y git git-lfs # Compile Blender RUN git clone --depth 1 --branch v${b3d_vs_major}.${b3d_vs_minor} \ https://projects.blender.org/blender/blender.git /opt/blender +# Get dependencies +RUN python /opt/blender/build_files/build_environment/install_linux_packages.py RUN cd /opt/blender && make update RUN cd /opt/blender && make -j$(nproc) -# Check if this folder exist -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 \ - libxfixes3 \ - libxkbcommon0 \ - libgl1 +RUN apt-get update && apt-get install -y python3 +COPY --from=b3dock /opt/blender/build_files/build_environment/install_linux_packages.py /media/install_linux_packages.py +RUN python3 /media/install_linux_packages.py && \ + rm /media/install_linux_packages.py && \ + apt --purge remove python3 RUN useradd -m -s /bin/bash bld