mirror of
https://gitlab.com/stilobique/blender-docker.git
synced 2026-05-27 20:27:47 +02:00
Compare commits
5 Commits
5a16e9de93
...
8445a95233
| Author | SHA1 | Date | |
|---|---|---|---|
| 8445a95233 | |||
| bf4144a84c | |||
| a104f50532 | |||
| 5cee49a567 | |||
| 8ef6d72ffe |
+38
-38
@@ -1,38 +1,38 @@
|
||||
cache:
|
||||
key: blender-source
|
||||
paths:
|
||||
- /opt/blender-git/blender # Blender git repository source
|
||||
- /opt/blender-git/lib # Blender Subversion lib package
|
||||
policy: pull
|
||||
|
||||
update-cache:
|
||||
stage: .pre
|
||||
cache:
|
||||
key: blender-source
|
||||
image: stilobique/csv:latest
|
||||
script:
|
||||
- mkdir -p /opt/blender-git/lib
|
||||
- cd /opt/blender-git
|
||||
- git clone https://projects.blender.org/blender/blender.git
|
||||
- cd /opt/blender-git/blender
|
||||
- git submodule update --init --recursive
|
||||
- cd /opt/blender-git/lib
|
||||
- svn checkout https://svn.blender.org/svnroot/bf-blender/trunk/lib/linux_centos7_x86_64
|
||||
|
||||
build-dockerfile:
|
||||
image: docker:19.03.12
|
||||
rules:
|
||||
- changes:
|
||||
- build.json
|
||||
stage: build
|
||||
services:
|
||||
- docker:dind
|
||||
cache:
|
||||
key: blender-source
|
||||
script:
|
||||
- apk add python3
|
||||
- apk add py3-pip
|
||||
- python3 -m pip install --upgrade pip
|
||||
- python3 -m pip install -r requirement-build.txt
|
||||
- python3 main.py
|
||||
- python3 main.py --tag=latest
|
||||
#cache:
|
||||
# key: blender-source
|
||||
# paths:
|
||||
# - /opt/blender-git/blender # Blender git repository source
|
||||
# - /opt/blender-git/lib # Blender Subversion lib package
|
||||
# policy: pull
|
||||
#
|
||||
#update-cache:
|
||||
# stage: .pre
|
||||
# cache:
|
||||
# key: blender-source
|
||||
# image: stilobique/csv:latest
|
||||
# script:
|
||||
# - mkdir -p /opt/blender-git/lib
|
||||
# - cd /opt/blender-git
|
||||
# - git clone https://projects.blender.org/blender/blender.git
|
||||
# - cd /opt/blender-git/blender
|
||||
# - git submodule update --init --recursive
|
||||
# - cd /opt/blender-git/lib
|
||||
# - svn checkout https://svn.blender.org/svnroot/bf-blender/trunk/lib/linux_centos7_x86_64
|
||||
#
|
||||
#build-dockerfile:
|
||||
# image: docker:19.03.12
|
||||
# rules:
|
||||
# - changes:
|
||||
# - build.json
|
||||
# stage: build
|
||||
# services:
|
||||
# - docker:dind
|
||||
# cache:
|
||||
# key: blender-source
|
||||
# script:
|
||||
# - apk add python3
|
||||
# - apk add py3-pip
|
||||
# - python3 -m pip install --upgrade pip
|
||||
# - python3 -m pip install -r requirement-build.txt
|
||||
# - python3 main.py
|
||||
# - python3 main.py --tag=latest
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<configuration default="false" name="Dockerfile" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
|
||||
<deployment type="dockerfile">
|
||||
<settings>
|
||||
<option name="imageTag" value="stilobique/blender:3.6.10" />
|
||||
<option name="imageTag" value="stilobique/blender:3.6.12" />
|
||||
<option name="buildArgs">
|
||||
<list>
|
||||
<DockerEnvVarImpl>
|
||||
@@ -11,7 +11,7 @@
|
||||
</DockerEnvVarImpl>
|
||||
<DockerEnvVarImpl>
|
||||
<option name="name" value="b3d_vs_minor" />
|
||||
<option name="value" value="10" />
|
||||
<option name="value" value="12" />
|
||||
</DockerEnvVarImpl>
|
||||
</list>
|
||||
</option>
|
||||
|
||||
@@ -8,9 +8,6 @@ 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
|
||||
|
||||
# Install dependencies
|
||||
RUN apt-get update && apt-get install -y build-essential \
|
||||
git \
|
||||
@@ -89,7 +86,6 @@ RUN apt-get update && apt-get install -y \
|
||||
libjack0 \
|
||||
pulseaudio \
|
||||
libgl1-mesa-glx
|
||||
# libxrender1 \
|
||||
|
||||
# Working Directory setup
|
||||
WORKDIR /opt/blender
|
||||
+24
@@ -1,8 +1,32 @@
|
||||
{
|
||||
"tags":
|
||||
[{
|
||||
"b3d_vs_major": 4.1,
|
||||
"b3d_vs_minor": 0
|
||||
},
|
||||
{
|
||||
"b3d_vs_major": 3.6,
|
||||
"b3d_vs_minor": 12
|
||||
},
|
||||
{
|
||||
"b3d_vs_major": 3.6,
|
||||
"b3d_vs_minor": 11
|
||||
},
|
||||
{
|
||||
"b3d_vs_major": 3.6,
|
||||
"b3d_vs_minor": 10
|
||||
},
|
||||
{
|
||||
"b3d_vs_major": 3.3,
|
||||
"b3d_vs_minor": 19
|
||||
},
|
||||
{
|
||||
"b3d_vs_major": 3.3,
|
||||
"b3d_vs_minor": 18
|
||||
},
|
||||
{
|
||||
"b3d_vs_major": 3.3,
|
||||
"b3d_vs_minor": 17
|
||||
}
|
||||
]
|
||||
}
|
||||
Reference in New Issue
Block a user