From 9f3e7d8728731957aee9387fcbb192b332045259 Mon Sep 17 00:00:00 2001 From: Nuwan Jayawardene Date: Wed, 8 Feb 2023 12:34:56 +0000 Subject: [PATCH 1/5] Update blender version on sample dockerfile --- samples/rqd/blender/blender2.79-docker/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/samples/rqd/blender/blender2.79-docker/Dockerfile b/samples/rqd/blender/blender2.79-docker/Dockerfile index 2c1b908f7..dcc7b871b 100644 --- a/samples/rqd/blender/blender2.79-docker/Dockerfile +++ b/samples/rqd/blender/blender2.79-docker/Dockerfile @@ -15,11 +15,11 @@ RUN yum -y install \ # Download and install Blender 2.79 RUN mkdir /usr/local/blender -RUN curl -SL https://download.blender.org/release/Blender2.79/blender-2.79-linux-glibc219-x86_64.tar.bz2 \ - -o blender.tar.bz2 +RUN curl -SL https://download.blender.org/release/Blender3.3/blender-3.3.3-linux-x64.tar.xz \ + -o blender.tar.xz -RUN tar -jxvf blender.tar.bz2 \ +RUN tar -xvf blender.tar.xz \ -C /usr/local/blender \ --strip-components=1 -RUN rm blender.tar.bz2 +RUN rm blender.tar.xz From b9191eeb649d7c58369943664f1f144ba3619726 Mon Sep 17 00:00:00 2001 From: Nuwan Jayawardene Date: Wed, 8 Feb 2023 16:08:41 +0000 Subject: [PATCH 2/5] Make amendments Update comments with version number Move directories --- samples/rqd/blender/{blender2.79-docker => }/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename samples/rqd/blender/{blender2.79-docker => }/Dockerfile (94%) diff --git a/samples/rqd/blender/blender2.79-docker/Dockerfile b/samples/rqd/blender/Dockerfile similarity index 94% rename from samples/rqd/blender/blender2.79-docker/Dockerfile rename to samples/rqd/blender/Dockerfile index dcc7b871b..e53fd995d 100644 --- a/samples/rqd/blender/blender2.79-docker/Dockerfile +++ b/samples/rqd/blender/Dockerfile @@ -13,7 +13,7 @@ RUN yum -y install \ libXinerama-devel \ libXrandr-devel -# Download and install Blender 2.79 +# Download and install Blender 3.3 RUN mkdir /usr/local/blender RUN curl -SL https://download.blender.org/release/Blender3.3/blender-3.3.3-linux-x64.tar.xz \ -o blender.tar.xz From 9422e0382548759042bc564247142034aa415da5 Mon Sep 17 00:00:00 2001 From: Nuwan Jayawardene Date: Thu, 9 Feb 2023 04:52:21 +0000 Subject: [PATCH 3/5] Make amendments Remove version details from comment Add Blender install verification command --- samples/rqd/blender/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/samples/rqd/blender/Dockerfile b/samples/rqd/blender/Dockerfile index e53fd995d..9a9e1eb60 100644 --- a/samples/rqd/blender/Dockerfile +++ b/samples/rqd/blender/Dockerfile @@ -13,7 +13,7 @@ RUN yum -y install \ libXinerama-devel \ libXrandr-devel -# Download and install Blender 3.3 +# Download and install Blender RUN mkdir /usr/local/blender RUN curl -SL https://download.blender.org/release/Blender3.3/blender-3.3.3-linux-x64.tar.xz \ -o blender.tar.xz @@ -23,3 +23,6 @@ RUN tar -xvf blender.tar.xz \ --strip-components=1 RUN rm blender.tar.xz + +# Verify Blender installation +RUN /usr/local/blender/blender --version From 9c86fafb066a02ce2accba783ad44fa46c4ac89e Mon Sep 17 00:00:00 2001 From: Nuwan Jayawardene Date: Fri, 10 Feb 2023 19:26:33 +0000 Subject: [PATCH 4/5] Set Blender install directory --- samples/rqd/blender/Dockerfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/samples/rqd/blender/Dockerfile b/samples/rqd/blender/Dockerfile index 9a9e1eb60..ab3a7bfba 100644 --- a/samples/rqd/blender/Dockerfile +++ b/samples/rqd/blender/Dockerfile @@ -13,16 +13,19 @@ RUN yum -y install \ libXinerama-devel \ libXrandr-devel +# Set Blender install directory +ARG BLENDER_INSTALL_DIR=/usr/local/blender + # Download and install Blender -RUN mkdir /usr/local/blender +RUN mkdir ${BLENDER_INSTALL_DIR} RUN curl -SL https://download.blender.org/release/Blender3.3/blender-3.3.3-linux-x64.tar.xz \ -o blender.tar.xz RUN tar -xvf blender.tar.xz \ - -C /usr/local/blender \ + -C ${BLENDER_INSTALL_DIR} \ --strip-components=1 RUN rm blender.tar.xz # Verify Blender installation -RUN /usr/local/blender/blender --version +RUN ${BLENDER_INSTALL_DIR}/blender --version From c8714df4dfcce6e940b583b999fb8b463337f6bb Mon Sep 17 00:00:00 2001 From: Nuwan Jayawardene Date: Fri, 10 Feb 2023 19:34:35 +0000 Subject: [PATCH 5/5] Set parameter for blender download source --- samples/rqd/blender/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/samples/rqd/blender/Dockerfile b/samples/rqd/blender/Dockerfile index ab3a7bfba..208f3c7a7 100644 --- a/samples/rqd/blender/Dockerfile +++ b/samples/rqd/blender/Dockerfile @@ -16,9 +16,12 @@ RUN yum -y install \ # Set Blender install directory ARG BLENDER_INSTALL_DIR=/usr/local/blender +# Set Blender download source +ARG BLENDER_DOWNLOAD_SRC=https://download.blender.org/release/Blender3.3/blender-3.3.3-linux-x64.tar.xz + # Download and install Blender RUN mkdir ${BLENDER_INSTALL_DIR} -RUN curl -SL https://download.blender.org/release/Blender3.3/blender-3.3.3-linux-x64.tar.xz \ +RUN curl -SL ${BLENDER_DOWNLOAD_SRC} \ -o blender.tar.xz RUN tar -xvf blender.tar.xz \