Disable the CI

Add more blender tags
Add all latest build
2024-05-31 10:09:39 +02:00 · 2024-05-25 17:05:51 +02:00 · 2024-05-10 19:19:43 +02:00 · 2024-05-10 15:12:25 +02:00 · 2024-05-09 16:55:40 +02:00 · 2024-05-09 16:04:14 +02:00
6 changed files with 122 additions and 150 deletions
@@ -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
@@ -1,21 +1,20 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Build BlenderDocker" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
+  <configuration default="false" name="Dockerfile" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
    <deployment type="dockerfile">
      <settings>
-        <option name="imageTag" value="stilobique/blender:5.1.2" />
+        <option name="imageTag" value="stilobique/blender:3.6.12" />
        <option name="buildArgs">
          <list>
            <DockerEnvVarImpl>
              <option name="name" value="b3d_vs_major" />
-              <option name="value" value="5.1" />
+              <option name="value" value="3.6" />
            </DockerEnvVarImpl>
            <DockerEnvVarImpl>
              <option name="name" value="b3d_vs_minor" />
-              <option name="value" value="2" />
+              <option name="value" value="12" />
            </DockerEnvVarImpl>
          </list>
        </option>
-        <option name="buildCliOptions" value="--debug" />
        <option name="buildOnly" value="true" />
        <option name="containerName" value="blender-latest" />
        <option name="sourceFilePath" value="Dockerfile" />
@@ -29,7 +28,6 @@
        </option>
      </settings>
    </deployment>
-    <EXTENSION ID="com.jetbrains.rider.docker.debug" isFastModeEnabled="true" isSslEnabled="false" />
    <method v="2" />
  </configuration>
 </component>
@@ -1,97 +1,91 @@
-FROM ubuntu:25.04 AS b3dock
+FROM ubuntu:22.04 AS blender

 # Setup all software version request
-ARG b3d_vs_major=5.1
-ARG b3d_vs_minor=0
+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
-
-## 01. Start First stage to build blender
 # Install dependencies
-RUN apt-get update && apt-get install -y \
+RUN apt-get update && apt-get install -y build-essential \
    git \
    git-lfs \
-    python3 \
-    build-essential \
-    subversion \
    cmake \
-    libx11-dev \
+    python3 \
+    python3-dev \
+    cython3 \
+    sudo
+
+RUN apt-get install -y libx11-dev \
    libxxf86vm-dev \
    libxcursor-dev \
    libxi-dev \
    libxrandr-dev \
    libxinerama-dev \
-    libegl-dev \
-    libwayland-dev \
-    wayland-protocols \
    libxkbcommon-dev \
+    libwayland-dev \
+    libdecor-0-dev \
+    wayland-protocols \
    libdbus-1-dev \
-    linux-libc-dev
+    libgl-dev \
+    libegl-dev
+
+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
+
+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 git clone --depth 1 --branch v${b3d_vs_major}.${b3d_vs_minor} \
-    https://projects.blender.org/blender/blender.git /opt/blender
-    
-RUN cd /opt/blender && make update
-RUN cd /opt/blender && make -j$(nproc)
+RUN cd /opt/blender-git && \
+    sudo ./build_files/utils/make_update.py --use-linux-libraries
+RUN cd /opt/blender-git &&  \
+    make

-
-## 02. Collecte all dependencies
-FROM b3dock AS collector
-# Rassemble toutes les .so des precompiled libs dans un dossier plat
-# -not -type d  : ignore les dossiers
-# cp -P         : préserve les symlinks relatifs (libFoo.so -> libFoo.so.1.0)
-RUN mkdir -p /collected-libs && \
-    find /opt/blender/lib/linux_x64 \
-        -name "*.so*" \
-        -not -type d \
-        -exec cp -P {} /collected-libs/ \;
-
-
-## 03. Build optimissed image
 ## Setup a Multistage optimisation
-FROM ubuntu:25.04
+FROM ubuntu:22.04
+COPY --from=blender /opt/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 \
-    libx11-6 \
    libxi6 \
    libxxf86vm1 \
-    libxrender1 \
-    libxrandr2 \
-    libxinerama1 \
-    libxcursor1 \
    libxfixes3 \
-    libxkbcommon0 \
-    libwayland-client0 \
-    libwayland-egl1 \
-    libegl1 \
-    libgl1 \
-    libdbus-1-3 \
-    libxcb1 \
-    libtbb12 \
-    libopenal1 \
-    libsm6 \
-    libice6 \
-    && rm -rf /var/lib/apt/lists/*
+    libxkbcommon-x11-0 \
+    libjack0 \
+    pulseaudio \
+    libgl1-mesa-glx

-RUN useradd -m -s /bin/bash bld
-
-COPY --from=b3dock /opt/build_linux/bin/blender /usr/local/bin/blender
-COPY --from=collector /collected-libs /usr/local/lib/blender
-
-RUN echo "/usr/local/lib/blender" > /etc/ld.so.conf.d/blender.conf \
-    && ldconfig
-
-ARG b3d_vs_major
-ENV B3D_ADDON_PATH="/home/bld/.config/blender/${b3d_vs_major}/scripts/addons"
-
-USER bld
 # Working Directory setup
-WORKDIR /home/bld
-
-ENTRYPOINT ["/usr/local/bin/blender"]
-CMD ["--version"]
+WORKDIR /opt/blender
@@ -1,4 +1,4 @@
-[![Blender](https://img.shields.io/badge/blender-5.1.2-%23F5792A.svg?style=flat&logo=blender&logoColor=white)](https://www.blender.org/download/)
+[![Blender](https://img.shields.io/badge/blender-3.0.0-%23F5792A.svg?style=flat&logo=blender&logoColor=white)](https://www.blender.org/download/)
 [![pipeline status](https://gitlab.com/stilobique/blender-docker/badges/main/pipeline.svg)](https://gitlab.com/stilobique/blender-docker/-/commits/main)  


@@ -25,9 +25,4 @@ Call this function with blender inside this container
 ````shell
 #!/bin/sh
 /opt/blender/blender --background --python "install.py"
-````
-
-# Check Image build
-```shell
-docker run --rm stilobique/blender:5.1.2 blender --version
-```
+````
@@ -1,40 +1,32 @@
 {
  "tags":
  [{
-      "b3d_vs_major": 3.4,
-      "b3d_vs_minor": 1
+      "b3d_vs_major": 4.1,
+      "b3d_vs_minor": 0
    },
    {
-      "b3d_vs_major": 3.4,
-      "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": 2
+      "b3d_vs_minor": 19
    },
    {
      "b3d_vs_major": 3.3,
-      "b3d_vs_minor": 1
+      "b3d_vs_minor": 18
    },
    {
      "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_minor": 17
    }
  ]
 }
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-LIB_PATHS="$(find /opt/blender-libs -type d -name lib | paste -sd: -)"
-export LD_LIBRARY_PATH="${LIB_PATHS}:${LD_LIBRARY_PATH}"
-
-exec /usr/local/bin/blender "$@"
Author	SHA1	Message	Date
stilobique	8445a95233	Disable the CI	2024-05-31 10:09:39 +02:00
stilobique	bf4144a84c	Add more blender tags	2024-05-25 17:05:51 +02:00
stilobique	a104f50532	Add all latest build	2024-05-10 19:19:43 +02:00
stilobique	5cee49a567	Add more docker blender version	2024-05-10 15:12:25 +02:00
stilobique	8ef6d72ffe	Clear unused comment	2024-05-09 16:55:40 +02:00
stilobique	5a16e9de93	Update the dockerfile to be functional ?	2024-05-09 16:04:14 +02:00
stilobique	e41f332f60	Reset all build list. Refactoring the docker file to be functional with the new blender platform and update the pycharm run config	2024-05-09 00:21:22 +02:00