Fix the build with latest release

This commit is contained in:
2026-06-19 16:39:09 +02:00
parent 776c8f77b4
commit 204c1da235
3 changed files with 32 additions and 35 deletions
@@ -1,20 +1,21 @@
<component name="ProjectRunConfigurationManager"> <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"> <deployment type="dockerfile">
<settings> <settings>
<option name="imageTag" value="stilobique/blender:3.4.0" /> <option name="imageTag" value="stilobique/blender:5.1.2" />
<option name="buildArgs"> <option name="buildArgs">
<list> <list>
<DockerEnvVarImpl> <DockerEnvVarImpl>
<option name="name" value="b3d_vs_major" /> <option name="name" value="b3d_vs_major" />
<option name="value" value="3.4" /> <option name="value" value="5.1" />
</DockerEnvVarImpl> </DockerEnvVarImpl>
<DockerEnvVarImpl> <DockerEnvVarImpl>
<option name="name" value="b3d_vs_minor" /> <option name="name" value="b3d_vs_minor" />
<option name="value" value="0" /> <option name="value" value="2" />
</DockerEnvVarImpl> </DockerEnvVarImpl>
</list> </list>
</option> </option>
<option name="buildCliOptions" value="--debug" />
<option name="buildOnly" value="true" /> <option name="buildOnly" value="true" />
<option name="containerName" value="blender-latest" /> <option name="containerName" value="blender-latest" />
<option name="sourceFilePath" value="Dockerfile" /> <option name="sourceFilePath" value="Dockerfile" />
@@ -28,6 +29,7 @@
</option> </option>
</settings> </settings>
</deployment> </deployment>
<EXTENSION ID="com.jetbrains.rider.docker.debug" isFastModeEnabled="true" isSslEnabled="false" />
<method v="2" /> <method v="2" />
</configuration> </configuration>
</component> </component>
+25 -30
View File
@@ -1,9 +1,8 @@
FROM ubuntu:22.04 AS blender FROM ubuntu:25.04 AS BlenderDocker
# Setup all software version request # Setup all software version request
ARG b3d_vs_major=2.90 ARG b3d_vs_major=5.1
ARG b3d_vs_minor=0 ARG b3d_vs_minor=0
ARG subversion=63014
LABEL Author="stilobique" LABEL Author="stilobique"
LABEL Title="Blender Docker for Unit Test" LABEL Title="Blender Docker for Unit Test"
@@ -13,41 +12,37 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
# Install dependencies # Install dependencies
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
build-essential \
gcc \
git \ git \
cmake \ git-lfs \
libc6-dev \ python3 \
libx11-dev \ build-essential \
subversion \ subversion \
libxrandr-dev \ cmake \
libxcursor-dev \ libx11-dev \
libxxf86vm-dev \ libxxf86vm-dev \
libxinerama-dev \ libxcursor-dev \
libglew-dev \
libxi-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 # 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
COPY --from=blender /opt/blender-git/build_linux/bin /opt/blender
## Setup a Multistage optimisation
FROM ubuntu:25.04
COPY --from=BlenderDocker /opt/blender/build_linux/bin /opt/blender
ARG b3d_vs_major ARG b3d_vs_major
ENV B3D_ADDON_PATH "$HOME/.config/blender/${b3d_vs_major}/scripts/addons" #ENV B3D_ADDON_PATH "$HOME/.config/blender/${b3d_vs_major}/scripts/addons"
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
libxi6 \ libxi6 \
+1 -1
View File
@@ -1,4 +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) [![pipeline status](https://gitlab.com/stilobique/blender-docker/badges/main/pipeline.svg)](https://gitlab.com/stilobique/blender-docker/-/commits/main)