Fix installation with blender 5.2.0
This commit is contained in:
@@ -1,32 +1,23 @@
|
|||||||
<component name="ProjectRunConfigurationManager">
|
<component name="ProjectRunConfigurationManager">
|
||||||
<configuration default="false" name="Build BlenderDocker" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
|
<configuration default="false" name="Build BlenderDocker" type="docker-deploy" factoryName="dockerfile" server-name="Docker Default">
|
||||||
<deployment type="dockerfile">
|
<deployment type="dockerfile">
|
||||||
<settings>
|
<settings>
|
||||||
<option name="imageTag" value="stilobique/blender:5.1.2" />
|
<option name="imageTag" value="stilobique/blender:5.2.0" />
|
||||||
<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="5.1" />
|
<option name="value" value="5.2" />
|
||||||
</DockerEnvVarImpl>
|
</DockerEnvVarImpl>
|
||||||
<DockerEnvVarImpl>
|
<DockerEnvVarImpl>
|
||||||
<option name="name" value="b3d_vs_minor" />
|
<option name="name" value="b3d_vs_minor" />
|
||||||
<option name="value" value="2" />
|
<option name="value" value="0" />
|
||||||
</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" />
|
||||||
<option name="volumeBindings">
|
|
||||||
<list>
|
|
||||||
<DockerVolumeBindingImpl>
|
|
||||||
<option name="containerPath" value="/moderlab-plugin" />
|
|
||||||
<option name="hostPath" value="E:\Projects\Git\Blender-Moderlab-Config\addons\moderlab-plugin\moderlab-plugin" />
|
|
||||||
</DockerVolumeBindingImpl>
|
|
||||||
</list>
|
|
||||||
</option>
|
|
||||||
</settings>
|
</settings>
|
||||||
</deployment>
|
</deployment>
|
||||||
<EXTENSION ID="com.jetbrains.rider.docker.debug" isFastModeEnabled="true" isSslEnabled="false" />
|
<EXTENSION ID="com.jetbrains.rider.docker.debug" isFastModeEnabled="true" isSslEnabled="false" />
|
||||||
|
|||||||
@@ -1,34 +0,0 @@
|
|||||||
<component name="ProjectRunConfigurationManager">
|
|
||||||
<configuration default="false" name="Generate image" type="PythonConfigurationType" factoryName="Python">
|
|
||||||
<module name="blender-docker" />
|
|
||||||
<option name="INTERPRETER_OPTIONS" value="" />
|
|
||||||
<option name="PARENT_ENVS" value="true" />
|
|
||||||
<envs>
|
|
||||||
<env name="PYTHONUNBUFFERED" value="1" />
|
|
||||||
</envs>
|
|
||||||
<option name="SDK_HOME" value="" />
|
|
||||||
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
|
||||||
<option name="IS_MODULE_SDK" value="true" />
|
|
||||||
<option name="ADD_CONTENT_ROOTS" value="true" />
|
|
||||||
<option name="ADD_SOURCE_ROOTS" value="true" />
|
|
||||||
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
|
|
||||||
<EXTENSION ID="net.ashald.envfile">
|
|
||||||
<option name="IS_ENABLED" value="false" />
|
|
||||||
<option name="IS_SUBST" value="false" />
|
|
||||||
<option name="IS_PATH_MACRO_SUPPORTED" value="false" />
|
|
||||||
<option name="IS_IGNORE_MISSING_FILES" value="false" />
|
|
||||||
<option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
|
|
||||||
<ENTRIES>
|
|
||||||
<ENTRY IS_ENABLED="true" PARSER="runconfig" />
|
|
||||||
</ENTRIES>
|
|
||||||
</EXTENSION>
|
|
||||||
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/main.py" />
|
|
||||||
<option name="PARAMETERS" value="" />
|
|
||||||
<option name="SHOW_COMMAND_LINE" value="false" />
|
|
||||||
<option name="EMULATE_TERMINAL" value="false" />
|
|
||||||
<option name="MODULE_MODE" value="false" />
|
|
||||||
<option name="REDIRECT_INPUT" value="false" />
|
|
||||||
<option name="INPUT_FILE" value="" />
|
|
||||||
<method v="2" />
|
|
||||||
</configuration>
|
|
||||||
</component>
|
|
||||||
+11
-32
@@ -1,60 +1,39 @@
|
|||||||
FROM ubuntu:25.04 AS b3dock
|
FROM python:latest AS b3dock
|
||||||
|
|
||||||
# Setup all software version request
|
# Setup all software version request
|
||||||
ARG b3d_vs_major=5.1
|
ARG b3d_vs_major=5.2
|
||||||
ARG b3d_vs_minor=0
|
ARG b3d_vs_minor=0
|
||||||
|
|
||||||
LABEL Author="stilobique"
|
LABEL Author="stilobique"
|
||||||
LABEL Title="Blender Docker for Unit Test"
|
LABEL Title="Blender Docker for Unit Test"
|
||||||
|
LABEL maintainer="Aurelien Vaillant contact@aurelien-vaillant.net"
|
||||||
|
|
||||||
#ENV TZ=Europe/Paris
|
#ENV TZ=Europe/Paris
|
||||||
#RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
|
#RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
|
||||||
|
|
||||||
## 01. Start First stage to build blender
|
## 01. Start First stage to build blender
|
||||||
# Install dependencies
|
# Install dependencies
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN apt-get update && apt-get install -y git git-lfs
|
||||||
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
|
|
||||||
|
|
||||||
# Compile Blender
|
# Compile Blender
|
||||||
RUN git clone --depth 1 --branch v${b3d_vs_major}.${b3d_vs_minor} \
|
RUN git clone --depth 1 --branch v${b3d_vs_major}.${b3d_vs_minor} \
|
||||||
https://projects.blender.org/blender/blender.git /opt/blender
|
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 update
|
||||||
RUN cd /opt/blender && make -j$(nproc)
|
RUN cd /opt/blender && make -j$(nproc)
|
||||||
|
|
||||||
# Check if this folder exist
|
|
||||||
RUN ls /opt/build_linux/bin/
|
|
||||||
|
|
||||||
|
|
||||||
## 02. Build optimissed image
|
## 02. Build optimissed image
|
||||||
## Setup a Multistage optimisation
|
## Setup a Multistage optimisation
|
||||||
FROM ubuntu:25.04 AS final
|
FROM ubuntu:25.04 AS final
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN apt-get update && apt-get install -y python3
|
||||||
libsm6 \
|
COPY --from=b3dock /opt/blender/build_files/build_environment/install_linux_packages.py /media/install_linux_packages.py
|
||||||
libxi6 \
|
RUN python3 /media/install_linux_packages.py && \
|
||||||
libxxf86vm1 \
|
rm /media/install_linux_packages.py && \
|
||||||
libxrender1 \
|
apt --purge remove python3
|
||||||
libxfixes3 \
|
|
||||||
libxkbcommon0 \
|
|
||||||
libgl1
|
|
||||||
|
|
||||||
RUN useradd -m -s /bin/bash bld
|
RUN useradd -m -s /bin/bash bld
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user