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
+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
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"
@@ -13,41 +12,37 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
# Install dependencies
RUN apt-get update && apt-get install -y \
build-essential \
gcc \
git \
cmake \
libc6-dev \
libx11-dev \
git-lfs \
python3 \
build-essential \
subversion \
libxrandr-dev \
libxcursor-dev \
cmake \
libx11-dev \
libxxf86vm-dev \
libxinerama-dev \
libglew-dev \
libxcursor-dev \
libxi-dev \
python3
# Debug
RUN echo Build Blender v${b3d_vs_major}.${b3d_vs_minor}
ADD . /opt/blender-git
libxrandr-dev \
libxinerama-dev \
libegl-dev \
libwayland-dev \
wayland-protocols \
libxkbcommon-dev \
libdbus-1-dev \
linux-libc-dev
# Compile Blender
RUN cd /opt/blender-git/ \
&& git checkout v${b3d_vs_major}.${b3d_vs_minor} \
&& 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
RUN git clone --depth 1 --branch v${b3d_vs_major}.${b3d_vs_minor} \
https://projects.blender.org/blender/blender.git /opt/blender
# Setup a Multistage optimisation
FROM ubuntu:22.04
COPY --from=blender /opt/blender-git/build_linux/bin /opt/blender
RUN cd /opt/blender && make update
RUN cd /opt/blender && make
## Setup a Multistage optimisation
FROM ubuntu:25.04
COPY --from=BlenderDocker /opt/blender/build_linux/bin /opt/blender
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 \
libxi6 \