kopia lustrzana https://github.com/nytimes/rd-blender-docker
Merge pull request #48 from nagtechie/blender-3.3.1
Add Blender 3.3.1 tags and generate new Dockerfilesmaster
commit
affb1b5fc8
69
.drone.yml
69
.drone.yml
|
@ -717,6 +717,73 @@ steps:
|
||||||
repo: nytimes/blender
|
repo: nytimes/blender
|
||||||
tags:
|
tags:
|
||||||
- 3.2-gpu-ubuntu18.04
|
- 3.2-gpu-ubuntu18.04
|
||||||
|
username:
|
||||||
|
from_secret: docker_username
|
||||||
|
|
||||||
|
trigger:
|
||||||
|
branch:
|
||||||
|
- master
|
||||||
|
event:
|
||||||
|
- push
|
||||||
|
|
||||||
|
---
|
||||||
|
kind: pipeline
|
||||||
|
name: 3.3.1-cpu-ubuntu18.04
|
||||||
|
|
||||||
|
platform:
|
||||||
|
os: linux
|
||||||
|
arch: amd64
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: generate
|
||||||
|
pull: if-not-exists
|
||||||
|
image: python:3.8-slim
|
||||||
|
commands:
|
||||||
|
- python3 generate.py
|
||||||
|
|
||||||
|
- name: 3.3.1-cpu-ubuntu18.04
|
||||||
|
pull: if-not-exists
|
||||||
|
image: plugins/docker
|
||||||
|
settings:
|
||||||
|
dockerfile: dist/3.3.1-cpu-ubuntu18.04/Dockerfile
|
||||||
|
password:
|
||||||
|
from_secret: docker_password
|
||||||
|
repo: nytimes/blender
|
||||||
|
tags: 3.3.1-cpu-ubuntu18.04
|
||||||
|
username:
|
||||||
|
from_secret: docker_username
|
||||||
|
|
||||||
|
trigger:
|
||||||
|
branch:
|
||||||
|
- master
|
||||||
|
event:
|
||||||
|
- push
|
||||||
|
|
||||||
|
---
|
||||||
|
kind: pipeline
|
||||||
|
name: 3.3.1-gpu-ubuntu18.04
|
||||||
|
|
||||||
|
platform:
|
||||||
|
os: linux
|
||||||
|
arch: amd64
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: generate
|
||||||
|
pull: if-not-exists
|
||||||
|
image: python:3.8-slim
|
||||||
|
commands:
|
||||||
|
- python3 generate.py
|
||||||
|
|
||||||
|
- name: 3.3.1-gpu-ubuntu18.04
|
||||||
|
pull: if-not-exists
|
||||||
|
image: plugins/docker
|
||||||
|
settings:
|
||||||
|
dockerfile: dist/3.3.1-gpu-ubuntu18.04/Dockerfile
|
||||||
|
password:
|
||||||
|
from_secret: docker_password
|
||||||
|
repo: nytimes/blender
|
||||||
|
tags:
|
||||||
|
- 3.3.1-gpu-ubuntu18.04
|
||||||
- latest
|
- latest
|
||||||
username:
|
username:
|
||||||
from_secret: docker_username
|
from_secret: docker_username
|
||||||
|
@ -770,6 +837,8 @@ depends_on:
|
||||||
- 3.1-cpu-ubuntu18.04
|
- 3.1-cpu-ubuntu18.04
|
||||||
- 3.2-gpu-ubuntu18.04
|
- 3.2-gpu-ubuntu18.04
|
||||||
- 3.2-cpu-ubuntu18.04
|
- 3.2-cpu-ubuntu18.04
|
||||||
|
- 3.3.1-gpu-ubuntu18.04
|
||||||
|
- 3.3.1-cpu-ubuntu18.04
|
||||||
|
|
||||||
trigger:
|
trigger:
|
||||||
branch:
|
branch:
|
||||||
|
|
|
@ -20,6 +20,9 @@ The images in this repository are autogenerated by running the `generate.py` scr
|
||||||
|
|
||||||
## Docker tags
|
## Docker tags
|
||||||
- `nytimes/blender:latest` - Latest GPU image with latest Blender version
|
- `nytimes/blender:latest` - Latest GPU image with latest Blender version
|
||||||
|
### 3.3.1
|
||||||
|
- `nytimes/blender:3.3.1-cpu-ubuntu18.04`
|
||||||
|
- `nytimes/blender:3.3.1-gpu-ubuntu18.04`
|
||||||
### 3.2
|
### 3.2
|
||||||
- `nytimes/blender:3.2-cpu-ubuntu18.04`
|
- `nytimes/blender:3.2-cpu-ubuntu18.04`
|
||||||
- `nytimes/blender:3.2-gpu-ubuntu18.04`
|
- `nytimes/blender:3.2-gpu-ubuntu18.04`
|
||||||
|
|
|
@ -0,0 +1,54 @@
|
||||||
|
# Dockerfile autogenerated on 10/23/2022, 22:17:04 by nagar
|
||||||
|
# Please do not edit this file directly
|
||||||
|
|
||||||
|
FROM ubuntu:18.04
|
||||||
|
|
||||||
|
LABEL Author="Or Fleisher <or.fleisher@nytimes.com>"
|
||||||
|
LABEL Title="Blender in Docker"
|
||||||
|
|
||||||
|
# Environment variables
|
||||||
|
ENV DEBIAN_FRONTEND noninteractive
|
||||||
|
ENV LC_ALL C.UTF-8
|
||||||
|
ENV LANG C.UTF-8
|
||||||
|
ENV PATH "$PATH:/bin/3.3/python/bin/"
|
||||||
|
ENV BLENDER_PATH "/bin/3.3"
|
||||||
|
ENV BLENDERPIP "/bin/3.3/python/bin/pip3"
|
||||||
|
ENV BLENDERPY "/bin/3.3/python/bin/python3.10"
|
||||||
|
ENV HW="CPU"
|
||||||
|
|
||||||
|
# Install dependencies
|
||||||
|
RUN apt-get update && apt-get install -y \
|
||||||
|
wget \
|
||||||
|
libopenexr-dev \
|
||||||
|
bzip2 \
|
||||||
|
build-essential \
|
||||||
|
zlib1g-dev \
|
||||||
|
libxmu-dev \
|
||||||
|
libxi-dev \
|
||||||
|
libxxf86vm-dev \
|
||||||
|
libfontconfig1 \
|
||||||
|
libxrender1 \
|
||||||
|
libgl1-mesa-glx \
|
||||||
|
xz-utils
|
||||||
|
|
||||||
|
# Download and install Blender
|
||||||
|
RUN wget https://mirror.clarkson.edu/blender/release/Blender3.3/blender-3.3.1-linux-x64.tar.xz \
|
||||||
|
&& tar -xvf blender-3.3.1-linux-x64.tar.xz --strip-components=1 -C /bin \
|
||||||
|
&& rm -rf blender-3.3.1-linux-x64.tar.xz \
|
||||||
|
&& rm -rf blender-3.3.1-linux-x64
|
||||||
|
|
||||||
|
# Download the Python source since it is not bundled with Blender
|
||||||
|
RUN wget https://www.python.org/ftp/python/3.10.5/Python-3.10.5.tgz \
|
||||||
|
&& tar -xzf Python-3.10.5.tgz \
|
||||||
|
&& cp -r Python-3.10.5/Include/* $BLENDER_PATH/python/include/python3.10/ \
|
||||||
|
&& rm -rf Python-3.10.5.tgz \
|
||||||
|
&& rm -rf Python-3.10.5
|
||||||
|
|
||||||
|
# Blender comes with a super outdated version of numpy (which is needed for matplotlib / opencv) so override it with a modern one
|
||||||
|
RUN rm -rf ${BLENDER_PATH}/python/lib/python3.10/site-packages/numpy
|
||||||
|
|
||||||
|
# Must first ensurepip to install Blender pip3 and then new numpy
|
||||||
|
RUN ${BLENDERPY} -m ensurepip && ${BLENDERPIP} install --upgrade pip && ${BLENDERPIP} install numpy
|
||||||
|
|
||||||
|
# Set the working directory
|
||||||
|
WORKDIR /
|
|
@ -0,0 +1,54 @@
|
||||||
|
# Dockerfile autogenerated on 10/23/2022, 22:17:04 by nagar
|
||||||
|
# Please do not edit this file directly
|
||||||
|
|
||||||
|
FROM nvidia/cudagl:10.1-base-ubuntu18.04
|
||||||
|
|
||||||
|
LABEL Author="Or Fleisher <or.fleisher@nytimes.com>"
|
||||||
|
LABEL Title="Blender in Docker"
|
||||||
|
|
||||||
|
# Environment variables
|
||||||
|
ENV DEBIAN_FRONTEND noninteractive
|
||||||
|
ENV LC_ALL C.UTF-8
|
||||||
|
ENV LANG C.UTF-8
|
||||||
|
ENV PATH "$PATH:/bin/3.3/python/bin/"
|
||||||
|
ENV BLENDER_PATH "/bin/3.3"
|
||||||
|
ENV BLENDERPIP "/bin/3.3/python/bin/pip3"
|
||||||
|
ENV BLENDERPY "/bin/3.3/python/bin/python3.10"
|
||||||
|
ENV HW="GPU"
|
||||||
|
|
||||||
|
# Install dependencies
|
||||||
|
RUN apt-get update && apt-get install -y \
|
||||||
|
wget \
|
||||||
|
libopenexr-dev \
|
||||||
|
bzip2 \
|
||||||
|
build-essential \
|
||||||
|
zlib1g-dev \
|
||||||
|
libxmu-dev \
|
||||||
|
libxi-dev \
|
||||||
|
libxxf86vm-dev \
|
||||||
|
libfontconfig1 \
|
||||||
|
libxrender1 \
|
||||||
|
libgl1-mesa-glx \
|
||||||
|
xz-utils
|
||||||
|
|
||||||
|
# Download and install Blender
|
||||||
|
RUN wget https://mirror.clarkson.edu/blender/release/Blender3.3/blender-3.3.1-linux-x64.tar.xz \
|
||||||
|
&& tar -xvf blender-3.3.1-linux-x64.tar.xz --strip-components=1 -C /bin \
|
||||||
|
&& rm -rf blender-3.3.1-linux-x64.tar.xz \
|
||||||
|
&& rm -rf blender-3.3.1-linux-x64
|
||||||
|
|
||||||
|
# Download the Python source since it is not bundled with Blender
|
||||||
|
RUN wget https://www.python.org/ftp/python/3.10.5/Python-3.10.5.tgz \
|
||||||
|
&& tar -xzf Python-3.10.5.tgz \
|
||||||
|
&& cp -r Python-3.10.5/Include/* $BLENDER_PATH/python/include/python3.10/ \
|
||||||
|
&& rm -rf Python-3.10.5.tgz \
|
||||||
|
&& rm -rf Python-3.10.5
|
||||||
|
|
||||||
|
# Blender comes with a super outdated version of numpy (which is needed for matplotlib / opencv) so override it with a modern one
|
||||||
|
RUN rm -rf ${BLENDER_PATH}/python/lib/python3.10/site-packages/numpy
|
||||||
|
|
||||||
|
# Must first ensurepip to install Blender pip3 and then new numpy
|
||||||
|
RUN ${BLENDERPY} -m ensurepip && ${BLENDERPIP} install --upgrade pip && ${BLENDERPIP} install numpy
|
||||||
|
|
||||||
|
# Set the working directory
|
||||||
|
WORKDIR /
|
|
@ -328,6 +328,34 @@
|
||||||
"BLENDERPY \"/bin/3.2/python/bin/python3.10\"",
|
"BLENDERPY \"/bin/3.2/python/bin/python3.10\"",
|
||||||
"HW=\"GPU\""
|
"HW=\"GPU\""
|
||||||
]
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"tag": "3.3.1-cpu-ubuntu18.04",
|
||||||
|
"base_os_image": "ubuntu:18.04",
|
||||||
|
"blender_download_url": "https://mirror.clarkson.edu/blender/release/Blender3.3/blender-3.3.1-linux-x64.tar.xz",
|
||||||
|
"python_download_url": "https://www.python.org/ftp/python/3.10.5/Python-3.10.5.tgz",
|
||||||
|
"python_version": "python3.10",
|
||||||
|
"env": [
|
||||||
|
"PATH \"$PATH:/bin/3.3/python/bin/\"",
|
||||||
|
"BLENDER_PATH \"/bin/3.3\"",
|
||||||
|
"BLENDERPIP \"/bin/3.3/python/bin/pip3\"",
|
||||||
|
"BLENDERPY \"/bin/3.3/python/bin/python3.10\"",
|
||||||
|
"HW=\"CPU\""
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"tag": "3.3.1-gpu-ubuntu18.04",
|
||||||
|
"base_os_image": "nvidia/cudagl:10.1-base-ubuntu18.04",
|
||||||
|
"blender_download_url": "https://mirror.clarkson.edu/blender/release/Blender3.3/blender-3.3.1-linux-x64.tar.xz",
|
||||||
|
"python_download_url": "https://www.python.org/ftp/python/3.10.5/Python-3.10.5.tgz",
|
||||||
|
"python_version": "python3.10",
|
||||||
|
"env": [
|
||||||
|
"PATH \"$PATH:/bin/3.3/python/bin/\"",
|
||||||
|
"BLENDER_PATH \"/bin/3.3\"",
|
||||||
|
"BLENDERPIP \"/bin/3.3/python/bin/pip3\"",
|
||||||
|
"BLENDERPY \"/bin/3.3/python/bin/python3.10\"",
|
||||||
|
"HW=\"GPU\""
|
||||||
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
Ładowanie…
Reference in New Issue