From c0afb5c9bc896bf29dbb4bb2c79df04105bc515d Mon Sep 17 00:00:00 2001 From: stilobique Date: Fri, 31 Jul 2026 10:57:38 +0200 Subject: [PATCH] Blender 5.1.2 (#1) Refactoring to works with the new blender depot config Reviewed-on: https://git.graou.studio/stilobique/blender-docker/pulls/1 Co-authored-by: stilobique --- .gitignore | 6 + .gitlab-ci.yml | 38 --- .idea/icon.svg | 66 +++++ ...age.run.xml => Automation Builder.run.xml} | 21 +- ...le.run.xml => Build BlenderDocker.run.xml} | 17 +- .run/Clean docker Images .run.xml | 27 ++ Dockerfile | 132 ++++++--- README.md | 60 +++- blender/__init__.py | 0 blender/dependency.py | 78 ++++++ blender/docker.py | 264 ++++++++++++++++++ blender/misc.py | 92 ++++++ blender/version.py | 43 +++ build.json | 40 --- image/Dockerfile-csv | 7 - main.py | 79 ++---- requirement-build.txt | 1 - requirements.txt | 3 + tasks.py | 34 +++ 19 files changed, 786 insertions(+), 222 deletions(-) delete mode 100644 .gitlab-ci.yml create mode 100644 .idea/icon.svg rename .run/{Generate image.run.xml => Automation Builder.run.xml} (52%) rename .run/{Dockerfile.run.xml => Build BlenderDocker.run.xml} (50%) create mode 100644 .run/Clean docker Images .run.xml create mode 100644 blender/__init__.py create mode 100644 blender/dependency.py create mode 100644 blender/docker.py create mode 100644 blender/misc.py create mode 100644 blender/version.py delete mode 100644 build.json delete mode 100644 image/Dockerfile-csv delete mode 100644 requirement-build.txt create mode 100644 requirements.txt create mode 100644 tasks.py diff --git a/.gitignore b/.gitignore index 07ccd38..b9c2a64 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,9 @@ +### Logs +**/logs/** + +### Config/setup """ +*.env + ### PyCharm ### .idea/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 908e3dc..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,38 +0,0 @@ -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 diff --git a/.idea/icon.svg b/.idea/icon.svg new file mode 100644 index 0000000..0b9bfa7 --- /dev/null +++ b/.idea/icon.svg @@ -0,0 +1,66 @@ + + + Blender logo (without text) + + + + + + + + + +Blender logo (without text) diff --git a/.run/Generate image.run.xml b/.run/Automation Builder.run.xml similarity index 52% rename from .run/Generate image.run.xml rename to .run/Automation Builder.run.xml index 85e76e6..a24d670 100644 --- a/.run/Generate image.run.xml +++ b/.run/Automation Builder.run.xml @@ -1,27 +1,20 @@ - - + + +