mirror of
https://gitlab.com/stilobique/blender-docker.git
synced 2026-05-28 04:37:47 +02:00
Compare commits
5 Commits
5a16e9de93
...
new-setup
| Author | SHA1 | Date | |
|---|---|---|---|
| 8445a95233 | |||
| bf4144a84c | |||
| a104f50532 | |||
| 5cee49a567 | |||
| 8ef6d72ffe |
+38
-38
@@ -1,38 +1,38 @@
|
|||||||
cache:
|
#cache:
|
||||||
key: blender-source
|
# key: blender-source
|
||||||
paths:
|
# paths:
|
||||||
- /opt/blender-git/blender # Blender git repository source
|
# - /opt/blender-git/blender # Blender git repository source
|
||||||
- /opt/blender-git/lib # Blender Subversion lib package
|
# - /opt/blender-git/lib # Blender Subversion lib package
|
||||||
policy: pull
|
# policy: pull
|
||||||
|
#
|
||||||
update-cache:
|
#update-cache:
|
||||||
stage: .pre
|
# stage: .pre
|
||||||
cache:
|
# cache:
|
||||||
key: blender-source
|
# key: blender-source
|
||||||
image: stilobique/csv:latest
|
# image: stilobique/csv:latest
|
||||||
script:
|
# script:
|
||||||
- mkdir -p /opt/blender-git/lib
|
# - mkdir -p /opt/blender-git/lib
|
||||||
- cd /opt/blender-git
|
# - cd /opt/blender-git
|
||||||
- git clone https://projects.blender.org/blender/blender.git
|
# - git clone https://projects.blender.org/blender/blender.git
|
||||||
- cd /opt/blender-git/blender
|
# - cd /opt/blender-git/blender
|
||||||
- git submodule update --init --recursive
|
# - git submodule update --init --recursive
|
||||||
- cd /opt/blender-git/lib
|
# - cd /opt/blender-git/lib
|
||||||
- svn checkout https://svn.blender.org/svnroot/bf-blender/trunk/lib/linux_centos7_x86_64
|
# - svn checkout https://svn.blender.org/svnroot/bf-blender/trunk/lib/linux_centos7_x86_64
|
||||||
|
#
|
||||||
build-dockerfile:
|
#build-dockerfile:
|
||||||
image: docker:19.03.12
|
# image: docker:19.03.12
|
||||||
rules:
|
# rules:
|
||||||
- changes:
|
# - changes:
|
||||||
- build.json
|
# - build.json
|
||||||
stage: build
|
# stage: build
|
||||||
services:
|
# services:
|
||||||
- docker:dind
|
# - docker:dind
|
||||||
cache:
|
# cache:
|
||||||
key: blender-source
|
# key: blender-source
|
||||||
script:
|
# script:
|
||||||
- apk add python3
|
# - apk add python3
|
||||||
- apk add py3-pip
|
# - apk add py3-pip
|
||||||
- python3 -m pip install --upgrade pip
|
# - python3 -m pip install --upgrade pip
|
||||||
- python3 -m pip install -r requirement-build.txt
|
# - python3 -m pip install -r requirement-build.txt
|
||||||
- python3 main.py
|
# - python3 main.py
|
||||||
- python3 main.py --tag=latest
|
# - python3 main.py --tag=latest
|
||||||
|
|||||||
@@ -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:3.6.10" />
|
<option name="imageTag" value="stilobique/blender:3.6.12" />
|
||||||
<option name="buildArgs">
|
<option name="buildArgs">
|
||||||
<list>
|
<list>
|
||||||
<DockerEnvVarImpl>
|
<DockerEnvVarImpl>
|
||||||
@@ -11,7 +11,7 @@
|
|||||||
</DockerEnvVarImpl>
|
</DockerEnvVarImpl>
|
||||||
<DockerEnvVarImpl>
|
<DockerEnvVarImpl>
|
||||||
<option name="name" value="b3d_vs_minor" />
|
<option name="name" value="b3d_vs_minor" />
|
||||||
<option name="value" value="10" />
|
<option name="value" value="12" />
|
||||||
</DockerEnvVarImpl>
|
</DockerEnvVarImpl>
|
||||||
</list>
|
</list>
|
||||||
</option>
|
</option>
|
||||||
|
|||||||
@@ -8,9 +8,6 @@ ARG version=v${b3d_vs_major}.${b3d_vs_minor}
|
|||||||
LABEL Author="stilobique"
|
LABEL Author="stilobique"
|
||||||
LABEL Title="Blender Docker for Unit Test"
|
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
|
# Install dependencies
|
||||||
RUN apt-get update && apt-get install -y build-essential \
|
RUN apt-get update && apt-get install -y build-essential \
|
||||||
git \
|
git \
|
||||||
@@ -89,7 +86,6 @@ RUN apt-get update && apt-get install -y \
|
|||||||
libjack0 \
|
libjack0 \
|
||||||
pulseaudio \
|
pulseaudio \
|
||||||
libgl1-mesa-glx
|
libgl1-mesa-glx
|
||||||
# libxrender1 \
|
|
||||||
|
|
||||||
# Working Directory setup
|
# Working Directory setup
|
||||||
WORKDIR /opt/blender
|
WORKDIR /opt/blender
|
||||||
+24
@@ -1,8 +1,32 @@
|
|||||||
{
|
{
|
||||||
"tags":
|
"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_major": 3.6,
|
||||||
"b3d_vs_minor": 10
|
"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