Update the Dockerfile setup

This commit is contained in:
Aurelien Vaillant
2021-11-24 13:31:00 +01:00
parent 878f421f8c
commit 349327408c
2 changed files with 14 additions and 4 deletions
+10 -1
View File
@@ -2,7 +2,7 @@
<configuration default="false" name="Dockerfile" type="docker-deploy" factoryName="dockerfile" server-name="Docker"> <configuration default="false" name="Dockerfile" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
<deployment type="dockerfile"> <deployment type="dockerfile">
<settings> <settings>
<option name="imageTag" value="stilobique/blender:2.93.6" /> <option name="imageTag" value="stilobique/blender:latest" />
<option name="buildArgs"> <option name="buildArgs">
<list> <list>
<DockerEnvVarImpl> <DockerEnvVarImpl>
@@ -16,7 +16,16 @@
</list> </list>
</option> </option>
<option name="buildOnly" value="true" /> <option name="buildOnly" value="true" />
<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>
<method v="2" /> <method v="2" />
+4 -3
View File
@@ -7,7 +7,7 @@ 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"
ENV B3D_ADDON_PATH "/bin/blender-${b3d_vs_major}.${b3d_vs_minor}-linux-x64/${b3d_vs_major}/scripts/addons" ENV B3D_ADDON_PATH "/bin/blender/${b3d_vs_major}/scripts/addons"
# Install dependencies # Install dependencies
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
@@ -24,7 +24,8 @@ RUN apt-get update && apt-get install -y \
# Install Blender # Install Blender
RUN wget https://download.blender.org/release/Blender${b3d_vs_major}/blender-${b3d_vs_major}.${b3d_vs_minor}-linux-x64.tar.xz -P /opt \ RUN wget https://download.blender.org/release/Blender${b3d_vs_major}/blender-${b3d_vs_major}.${b3d_vs_minor}-linux-x64.tar.xz -P /opt \
&& tar -xvf /opt/blender-${b3d_vs_major}.${b3d_vs_minor}-linux-x64.tar.xz -C /opt \ && tar -xvf /opt/blender-${b3d_vs_major}.${b3d_vs_minor}-linux-x64.tar.xz -C /opt \
&& rm -rf /opt/blender-${b3d_vs_major}.${b3d_vs_minor}-linux-x64.tar.xz && rm -rf /opt/blender-${b3d_vs_major}.${b3d_vs_minor}-linux-x64.tar.xz \
&& mv /opt/blender-${b3d_vs_major}.${b3d_vs_minor}-linux-x64 /opt/blender
# Working Directory setup # Working Directory setup
WORKDIR /opt/blender-${b3d_vs_major}.${b3d_vs_minor}-linux-x64 WORKDIR /