Reset all build list.

Refactoring the docker file to be functional with the new blender platform and update the pycharm run config
This commit is contained in:
2024-05-09 00:21:22 +02:00
parent 776c8f77b4
commit e41f332f60
3 changed files with 69 additions and 71 deletions
+3 -3
View File
@@ -2,16 +2,16 @@
<configuration default="false" name="Dockerfile" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
<deployment type="dockerfile">
<settings>
<option name="imageTag" value="stilobique/blender:3.4.0" />
<option name="imageTag" value="stilobique/blender:3.6.10" />
<option name="buildArgs">
<list>
<DockerEnvVarImpl>
<option name="name" value="b3d_vs_major" />
<option name="value" value="3.4" />
<option name="value" value="3.6" />
</DockerEnvVarImpl>
<DockerEnvVarImpl>
<option name="name" value="b3d_vs_minor" />
<option name="value" value="0" />
<option name="value" value="10" />
</DockerEnvVarImpl>
</list>
</option>
+64 -34
View File
@@ -1,59 +1,89 @@
FROM ubuntu:22.04 AS blender
# Setup all software version request
ARG b3d_vs_major=2.90
ARG b3d_vs_minor=0
ARG subversion=63014
ARG b3d_vs_major=3.6
ARG b3d_vs_minor=10
ARG version=v${b3d_vs_major}.${b3d_vs_minor}
LABEL Author="stilobique"
LABEL Title="Blender Docker for Unit Test"
ENV TZ=Europe/Paris
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
#ENV TZ=Europe/Paris
#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 \
RUN apt-get update && apt-get install -y build-essential \
git \
git-lfs \
cmake \
libc6-dev \
libx11-dev \
subversion \
libxrandr-dev \
libxcursor-dev \
python3 \
python3-dev \
cython3 \
sudo
RUN apt-get install -y libx11-dev \
libxxf86vm-dev \
libxinerama-dev \
libglew-dev \
libxcursor-dev \
libxi-dev \
python3
libxrandr-dev \
libxinerama-dev \
libxkbcommon-dev \
libwayland-dev \
libdecor-0-dev \
wayland-protocols \
libdbus-1-dev \
libgl-dev \
libegl-dev
# Debug
RUN echo Build Blender v${b3d_vs_major}.${b3d_vs_minor}
RUN apt-get install -y libjpeg-dev \
libpng-dev \
libfreetype-dev \
libfontconfig-dev \
libzstd-dev \
libbz2-dev \
liblzma-dev \
libsdl2-dev \
libepoxy-dev \
libxml2-dev \
libhpdf-dev \
libpystring-dev
ADD . /opt/blender-git
RUN apt-get install -y libopenjp2-7-dev \
libtiff-dev \
libjack-jackd2-dev \
libpulse-dev \
libopenal-dev \
libsndfile1-dev \
libjemalloc-dev \
libvulkan-dev \
libgmp-dev \
libpugixml-dev \
libfftw3-dev \
libpotrace-dev \
libyaml-cpp-dev \
libdeflate-dev
# ADD . /opt/blender-git
RUN git clone --depth 1 --branch ${version} https://projects.blender.org/blender/blender.git /opt/blender-git
# Use the local repo has current directory
WORKDIR /opt/blender-git
# 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 sudo build_files/utils/make_update.py --use-linux-libraries
RUN make
# Setup a Multistage optimisation
## Setup a Multistage optimisation
FROM ubuntu:22.04
COPY --from=blender /opt/blender-git/build_linux/bin /opt/blender
COPY --from=blender /build_linux/bin /opt/blender
ARG b3d_vs_major
ENV B3D_ADDON_PATH "$HOME/.config/blender/${b3d_vs_major}/scripts/addons"
RUN apt-get update && apt-get install -y \
libxi6 \
libxxf86vm1 \
libxrender1 \
libgl1-mesa-glx
#RUN apt-get update && apt-get install -y \
# libxi6 \
# libxxf86vm1 \
# libxrender1 \
# libgl1-mesa-glx
# Working Directory setup
WORKDIR /
+2 -34
View File
@@ -1,40 +1,8 @@
{
"tags":
[{
"b3d_vs_major": 3.4,
"b3d_vs_minor": 1
},
{
"b3d_vs_major": 3.4,
"b3d_vs_minor": 0
},
{
"b3d_vs_major": 3.3,
"b3d_vs_minor": 2
},
{
"b3d_vs_major": 3.3,
"b3d_vs_minor": 1
},
{
"b3d_vs_major": 3.3,
"b3d_vs_minor": 0
},
{
"b3d_vs_major": 3.2,
"b3d_vs_minor": 1
},
{
"b3d_vs_major": 3.2,
"b3d_vs_minor": 0
},
{
"b3d_vs_major": 3.1,
"b3d_vs_minor": 2
},
{
"b3d_vs_major": 3.1,
"b3d_vs_minor": 0
"b3d_vs_major": 3.6,
"b3d_vs_minor": 10
}
]
}