From e11d273fa831906196bdce83f056255a2c127c6f Mon Sep 17 00:00:00 2001 From: Or Fleisher Date: Thu, 25 Feb 2021 17:13:45 -0500 Subject: [PATCH] =?UTF-8?q?Add=20Blender=202.92=20tags=20and=20generate=20?= =?UTF-8?q?new=20Dockerfiles=20=F0=9F=93=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 4 ++- README.md | 3 ++ dist/2.80-cpu-ubuntu18.04/Dockerfile | 2 +- dist/2.80-gpu-ubuntu18.04/Dockerfile | 2 +- dist/2.81-cpu-ubuntu18.04/Dockerfile | 2 +- dist/2.81-gpu-ubuntu18.04/Dockerfile | 2 +- dist/2.82-cpu-ubuntu18.04/Dockerfile | 2 +- dist/2.82-gpu-ubuntu18.04/Dockerfile | 2 +- dist/2.83-cpu-ubuntu18.04/Dockerfile | 2 +- dist/2.83-gpu-ubuntu18.04/Dockerfile | 2 +- dist/2.90-cpu-ubuntu18.04/Dockerfile | 2 +- dist/2.90-gpu-ubuntu18.04/Dockerfile | 2 +- dist/2.91-cpu-ubuntu18.04/Dockerfile | 2 +- dist/2.91-gpu-ubuntu18.04/Dockerfile | 2 +- dist/2.92-cpu-ubuntu18.04/Dockerfile | 54 ++++++++++++++++++++++++++++ dist/2.92-gpu-ubuntu18.04/Dockerfile | 54 ++++++++++++++++++++++++++++ manifest.json | 24 +++++++++++++ 17 files changed, 150 insertions(+), 13 deletions(-) create mode 100644 dist/2.92-cpu-ubuntu18.04/Dockerfile create mode 100644 dist/2.92-gpu-ubuntu18.04/Dockerfile diff --git a/.travis.yml b/.travis.yml index c394256..9144005 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 \ No newline at end of file diff --git a/README.md b/README.md index 7d0f664..27cacc8 100644 --- a/README.md +++ b/README.md @@ -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` diff --git a/dist/2.80-cpu-ubuntu18.04/Dockerfile b/dist/2.80-cpu-ubuntu18.04/Dockerfile index dfc77b1..a81f5d5 100644 --- a/dist/2.80-cpu-ubuntu18.04/Dockerfile +++ b/dist/2.80-cpu-ubuntu18.04/Dockerfile @@ -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 diff --git a/dist/2.80-gpu-ubuntu18.04/Dockerfile b/dist/2.80-gpu-ubuntu18.04/Dockerfile index df66ecb..55dba42 100644 --- a/dist/2.80-gpu-ubuntu18.04/Dockerfile +++ b/dist/2.80-gpu-ubuntu18.04/Dockerfile @@ -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 diff --git a/dist/2.81-cpu-ubuntu18.04/Dockerfile b/dist/2.81-cpu-ubuntu18.04/Dockerfile index 5d9fcdf..15878d4 100644 --- a/dist/2.81-cpu-ubuntu18.04/Dockerfile +++ b/dist/2.81-cpu-ubuntu18.04/Dockerfile @@ -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 diff --git a/dist/2.81-gpu-ubuntu18.04/Dockerfile b/dist/2.81-gpu-ubuntu18.04/Dockerfile index b5695a2..319dbae 100644 --- a/dist/2.81-gpu-ubuntu18.04/Dockerfile +++ b/dist/2.81-gpu-ubuntu18.04/Dockerfile @@ -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 diff --git a/dist/2.82-cpu-ubuntu18.04/Dockerfile b/dist/2.82-cpu-ubuntu18.04/Dockerfile index 9c8186b..0798080 100644 --- a/dist/2.82-cpu-ubuntu18.04/Dockerfile +++ b/dist/2.82-cpu-ubuntu18.04/Dockerfile @@ -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 diff --git a/dist/2.82-gpu-ubuntu18.04/Dockerfile b/dist/2.82-gpu-ubuntu18.04/Dockerfile index 6a9c897..855e3d5 100644 --- a/dist/2.82-gpu-ubuntu18.04/Dockerfile +++ b/dist/2.82-gpu-ubuntu18.04/Dockerfile @@ -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 diff --git a/dist/2.83-cpu-ubuntu18.04/Dockerfile b/dist/2.83-cpu-ubuntu18.04/Dockerfile index 7f830ed..5b2833a 100644 --- a/dist/2.83-cpu-ubuntu18.04/Dockerfile +++ b/dist/2.83-cpu-ubuntu18.04/Dockerfile @@ -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 diff --git a/dist/2.83-gpu-ubuntu18.04/Dockerfile b/dist/2.83-gpu-ubuntu18.04/Dockerfile index 9cc0f13..1450db9 100644 --- a/dist/2.83-gpu-ubuntu18.04/Dockerfile +++ b/dist/2.83-gpu-ubuntu18.04/Dockerfile @@ -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 diff --git a/dist/2.90-cpu-ubuntu18.04/Dockerfile b/dist/2.90-cpu-ubuntu18.04/Dockerfile index 86d0bca..fa30e7a 100644 --- a/dist/2.90-cpu-ubuntu18.04/Dockerfile +++ b/dist/2.90-cpu-ubuntu18.04/Dockerfile @@ -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 diff --git a/dist/2.90-gpu-ubuntu18.04/Dockerfile b/dist/2.90-gpu-ubuntu18.04/Dockerfile index c7ef903..15e6d0a 100644 --- a/dist/2.90-gpu-ubuntu18.04/Dockerfile +++ b/dist/2.90-gpu-ubuntu18.04/Dockerfile @@ -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 diff --git a/dist/2.91-cpu-ubuntu18.04/Dockerfile b/dist/2.91-cpu-ubuntu18.04/Dockerfile index a2430f9..8c2994b 100644 --- a/dist/2.91-cpu-ubuntu18.04/Dockerfile +++ b/dist/2.91-cpu-ubuntu18.04/Dockerfile @@ -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 diff --git a/dist/2.91-gpu-ubuntu18.04/Dockerfile b/dist/2.91-gpu-ubuntu18.04/Dockerfile index d011398..18710b2 100644 --- a/dist/2.91-gpu-ubuntu18.04/Dockerfile +++ b/dist/2.91-gpu-ubuntu18.04/Dockerfile @@ -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 diff --git a/dist/2.92-cpu-ubuntu18.04/Dockerfile b/dist/2.92-cpu-ubuntu18.04/Dockerfile new file mode 100644 index 0000000..d522c87 --- /dev/null +++ b/dist/2.92-cpu-ubuntu18.04/Dockerfile @@ -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 " +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 / \ No newline at end of file diff --git a/dist/2.92-gpu-ubuntu18.04/Dockerfile b/dist/2.92-gpu-ubuntu18.04/Dockerfile new file mode 100644 index 0000000..589fb5b --- /dev/null +++ b/dist/2.92-gpu-ubuntu18.04/Dockerfile @@ -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 " +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 / \ No newline at end of file diff --git a/manifest.json b/manifest.json index e3ade76..284ddeb 100644 --- a/manifest.json +++ b/manifest.json @@ -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\"" + ] } ]