Add Blender 2.92 tags and generate new Dockerfiles 📦

pull/22/head
Or Fleisher 2021-02-25 17:13:45 -05:00
rodzic 064c8867d6
commit e11d273fa8
17 zmienionych plików z 150 dodań i 13 usunięć

Wyświetl plik

@ -23,7 +23,9 @@ script:
- if [[ $TRAVIS_PULL_REQUEST == 'false' ]]; then docker push nytimes/blender:2.90-gpu-ubuntu18.04; fi
- if [[ $TRAVIS_PULL_REQUEST == 'false' ]]; then docker push nytimes/blender:2.91-cpu-ubuntu18.04; fi
- if [[ $TRAVIS_PULL_REQUEST == 'false' ]]; then docker push nytimes/blender:2.91-gpu-ubuntu18.04; fi
- if [[ $TRAVIS_PULL_REQUEST == 'false' ]]; then docker tag nytimes/blender:2.91-gpu-ubuntu18.04 nytimes/blender:latest; fi
- if [[ $TRAVIS_PULL_REQUEST == 'false' ]]; then docker push nytimes/blender:2.92-cpu-ubuntu18.04; fi
- if [[ $TRAVIS_PULL_REQUEST == 'false' ]]; then docker push nytimes/blender:2.92-gpu-ubuntu18.04; fi
- if [[ $TRAVIS_PULL_REQUEST == 'false' ]]; then docker tag nytimes/blender:2.92-gpu-ubuntu18.04 nytimes/blender:latest; fi
- if [[ $TRAVIS_PULL_REQUEST == 'false' ]]; then docker push nytimes/blender:latest; fi
after_success:
- bash ./notify.sh

Wyświetl plik

@ -20,6 +20,9 @@ The images in this repository are autogenerated by running the `generate.py` scr
## Docker tags
- `nytimes/blender:latest` - Latest GPU image with latest Blender version
### 2.92
- `nytimes/blender:2.92-cpu-ubuntu18.04`
- `nytimes/blender:2.92-gpu-ubuntu18.04`
### 2.91
- `nytimes/blender:2.91-cpu-ubuntu18.04`
- `nytimes/blender:2.91-gpu-ubuntu18.04`

Wyświetl plik

@ -1,4 +1,4 @@
# Dockerfile autogenerated on 11/30/2020, 11:38:56 by juniorxsound
# Dockerfile autogenerated on 02/25/2021, 16:04:39 by juniorxsound
# Please do not edit this file directly
FROM ubuntu:18.04

Wyświetl plik

@ -1,4 +1,4 @@
# Dockerfile autogenerated on 11/30/2020, 11:38:56 by juniorxsound
# Dockerfile autogenerated on 02/25/2021, 16:04:39 by juniorxsound
# Please do not edit this file directly
FROM nvidia/cudagl:10.1-base-ubuntu18.04

Wyświetl plik

@ -1,4 +1,4 @@
# Dockerfile autogenerated on 11/30/2020, 11:38:56 by juniorxsound
# Dockerfile autogenerated on 02/25/2021, 16:04:39 by juniorxsound
# Please do not edit this file directly
FROM ubuntu:18.04

Wyświetl plik

@ -1,4 +1,4 @@
# Dockerfile autogenerated on 11/30/2020, 11:38:56 by juniorxsound
# Dockerfile autogenerated on 02/25/2021, 16:04:39 by juniorxsound
# Please do not edit this file directly
FROM nvidia/cudagl:10.1-base-ubuntu18.04

Wyświetl plik

@ -1,4 +1,4 @@
# Dockerfile autogenerated on 11/30/2020, 11:38:56 by juniorxsound
# Dockerfile autogenerated on 02/25/2021, 16:04:39 by juniorxsound
# Please do not edit this file directly
FROM ubuntu:18.04

Wyświetl plik

@ -1,4 +1,4 @@
# Dockerfile autogenerated on 11/30/2020, 11:38:56 by juniorxsound
# Dockerfile autogenerated on 02/25/2021, 16:04:39 by juniorxsound
# Please do not edit this file directly
FROM nvidia/cudagl:10.1-base-ubuntu18.04

Wyświetl plik

@ -1,4 +1,4 @@
# Dockerfile autogenerated on 11/30/2020, 11:38:56 by juniorxsound
# Dockerfile autogenerated on 02/25/2021, 16:04:39 by juniorxsound
# Please do not edit this file directly
FROM ubuntu:18.04

Wyświetl plik

@ -1,4 +1,4 @@
# Dockerfile autogenerated on 11/30/2020, 11:38:56 by juniorxsound
# Dockerfile autogenerated on 02/25/2021, 16:04:39 by juniorxsound
# Please do not edit this file directly
FROM nvidia/cudagl:10.1-base-ubuntu18.04

Wyświetl plik

@ -1,4 +1,4 @@
# Dockerfile autogenerated on 11/30/2020, 11:38:56 by juniorxsound
# Dockerfile autogenerated on 02/25/2021, 16:04:39 by juniorxsound
# Please do not edit this file directly
FROM ubuntu:18.04

Wyświetl plik

@ -1,4 +1,4 @@
# Dockerfile autogenerated on 11/30/2020, 11:38:56 by juniorxsound
# Dockerfile autogenerated on 02/25/2021, 16:04:39 by juniorxsound
# Please do not edit this file directly
FROM nvidia/cudagl:10.1-base-ubuntu18.04

Wyświetl plik

@ -1,4 +1,4 @@
# Dockerfile autogenerated on 11/30/2020, 11:38:56 by juniorxsound
# Dockerfile autogenerated on 02/25/2021, 16:04:39 by juniorxsound
# Please do not edit this file directly
FROM ubuntu:18.04

Wyświetl plik

@ -1,4 +1,4 @@
# Dockerfile autogenerated on 11/30/2020, 11:38:56 by juniorxsound
# Dockerfile autogenerated on 02/25/2021, 16:04:39 by juniorxsound
# Please do not edit this file directly
FROM nvidia/cudagl:10.1-base-ubuntu18.04

Wyświetl plik

@ -0,0 +1,54 @@
# Dockerfile autogenerated on 02/25/2021, 16:04:39 by juniorxsound
# Please do not edit this file directly
FROM ubuntu:18.04
LABEL Author="Or Fleisher <or.fleisher@nytimes.com>"
LABEL Title="Blender in Docker"
# Enviorment variables
ENV DEBIAN_FRONTEND noninteractive
ENV LC_ALL C.UTF-8
ENV LANG C.UTF-8
ENV PATH "$PATH:/bin/2.92/python/bin/"
ENV BLENDER_PATH "/bin/2.92"
ENV BLENDERPIP "/bin/2.92/python/bin/pip3"
ENV BLENDERPY "/bin/2.92/python/bin/python3.7m"
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/Blender2.92/blender-2.92.0-linux64.tar.xz \
&& tar -xvf blender-2.92.0-linux64.tar.xz --strip-components=1 -C /bin \
&& rm -rf blender-2.92.0-linux64.tar.xz \
&& rm -rf blender-2.92.0-linux64
# Download the Python source since it is not bundled with Blender
RUN wget https://www.python.org/ftp/python/3.7.0/Python-3.7.0.tgz \
&& tar -xzf Python-3.7.0.tgz \
&& cp -r Python-3.7.0/Include/* $BLENDER_PATH/python/include/python3.7m/ \
&& rm -rf Python-3.7.0.tgz \
&& rm -rf Python-3.7.0
# 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.7/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 /

Wyświetl plik

@ -0,0 +1,54 @@
# Dockerfile autogenerated on 02/25/2021, 16:04:39 by juniorxsound
# 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"
# Enviorment variables
ENV DEBIAN_FRONTEND noninteractive
ENV LC_ALL C.UTF-8
ENV LANG C.UTF-8
ENV PATH "$PATH:/bin/2.92/python/bin/"
ENV BLENDER_PATH "/bin/2.92"
ENV BLENDERPIP "/bin/2.92/python/bin/pip3"
ENV BLENDERPY "/bin/2.92/python/bin/python3.7m"
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/Blender2.92/blender-2.92.0-linux64.tar.xz \
&& tar -xvf blender-2.92.0-linux64.tar.xz --strip-components=1 -C /bin \
&& rm -rf blender-2.92.0-linux64.tar.xz \
&& rm -rf blender-2.92.0-linux64
# Download the Python source since it is not bundled with Blender
RUN wget https://www.python.org/ftp/python/3.7.0/Python-3.7.0.tgz \
&& tar -xzf Python-3.7.0.tgz \
&& cp -r Python-3.7.0/Include/* $BLENDER_PATH/python/include/python3.7m/ \
&& rm -rf Python-3.7.0.tgz \
&& rm -rf Python-3.7.0
# 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.7/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 /

Wyświetl plik

@ -164,6 +164,30 @@
"BLENDERPY \"/bin/2.91/python/bin/python3.7m\"",
"HW=\"GPU\""
]
},
{
"tag": "2.92-cpu-ubuntu18.04",
"base_os_image": "ubuntu:18.04",
"blender_download_url": "https://mirror.clarkson.edu/blender/release/Blender2.92/blender-2.92.0-linux64.tar.xz",
"env": [
"PATH \"$PATH:/bin/2.92/python/bin/\"",
"BLENDER_PATH \"/bin/2.92\"",
"BLENDERPIP \"/bin/2.92/python/bin/pip3\"",
"BLENDERPY \"/bin/2.92/python/bin/python3.7m\"",
"HW=\"CPU\""
]
},
{
"tag": "2.92-gpu-ubuntu18.04",
"base_os_image": "nvidia/cudagl:10.1-base-ubuntu18.04",
"blender_download_url": "https://mirror.clarkson.edu/blender/release/Blender2.92/blender-2.92.0-linux64.tar.xz",
"env": [
"PATH \"$PATH:/bin/2.92/python/bin/\"",
"BLENDER_PATH \"/bin/2.92\"",
"BLENDERPIP \"/bin/2.92/python/bin/pip3\"",
"BLENDERPY \"/bin/2.92/python/bin/python3.7m\"",
"HW=\"GPU\""
]
}
]