feat: support until R2023b, new generator

demartis · Nov 15, 2023 · a1f460d · a1f460d
1 parent a7a1e6c
commit a1f460d
Show file tree

Hide file tree

Showing 20 changed files with 319 additions and 181 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -168,7 +168,6 @@ jobs:
       DOCKERHUB_REPO: demartis/matlab-runtime
       DOCKERHUB_TAG: R2023a
       DOCKER_CONTEXT: R2023a
-      is_latest: true
 
   R2023a-meshlab:
     needs: [ R2023a ]
@@ -178,4 +177,22 @@ jobs:
       DOCKERHUB_REPO: demartis/matlab-runtime
       DOCKERHUB_TAG: R2023a-meshlab
       DOCKER_CONTEXT: R2023a-meshlab
+
+  R2023b:
+    uses: ./.github/workflows/sub_release.yaml
+    secrets: inherit
+    with:
+      DOCKERHUB_REPO: demartis/matlab-runtime
+      DOCKERHUB_TAG: R2023b
+      DOCKER_CONTEXT: R2023b
+      is_latest: true
+
+  R2023b-meshlab:
+    needs: [ R2023b ]
+    uses: ./.github/workflows/sub_release.yaml
+    secrets: inherit
+    with:
+      DOCKERHUB_REPO: demartis/matlab-runtime
+      DOCKERHUB_TAG: R2023b-meshlab
+      DOCKER_CONTEXT: R2023b-meshlab
       is_latest_meshlab: true
diff --git a/R2019a/Dockerfile b/R2019a/Dockerfile
@@ -23,27 +23,30 @@ FROM debian:buster-slim
 MAINTAINER Riccardo De Martis <riccardo@demartis.it>  
 ENV DEBIAN_FRONTEND noninteractive  
 
-RUN apt-get -q update && \  
-    apt-get install -q -y --no-install-recommends \  
-      xorg \  
-      unzip \  
-      wget \  
-      curl && \  
-    apt-get clean && \  
+RUN apt-get -q update && \
+    apt-get install -q -y --no-install-recommends \
+      xorg \
+      unzip \
+      wget \
+      curl && \
+    apt-get clean && \
     rm -rf /var/lib/apt/lists/*  
 
 # Download the MCR from MathWorks site an install with -mode silent  
-RUN mkdir /mcr-install && \  
-    mkdir /opt/mcr && \  
-    cd /mcr-install && \  
-    wget --no-check-certificate -q https://ssd.mathworks.com/supportfiles/downloads/R2019a/Release/9/deployment_files/installer/complete/glnxa64/MATLAB_Runtime_R2019a_Update_9_glnxa64.zip && \  
-    unzip -q MATLAB_Runtime_R2019a_Update_9_glnxa64.zip && \  
-    rm -f MATLAB_Runtime_R2019a_Update_9_glnxa64.zip && \  
-    ./install -destinationFolder /opt/mcr -agreeToLicense yes -mode silent && \  
-    cd / && \  
+RUN mkdir /mcr-install && \
+    mkdir /opt/mcr && \
+    cd /mcr-install && \
+    wget --no-check-certificate -q https://ssd.mathworks.com/supportfiles/downloads/R2019a/Release/9/deployment_files/installer/complete/glnxa64/MATLAB_Runtime_R2019a_Update_9_glnxa64.zip && \
+    unzip -q MATLAB_Runtime_R2019a_Update_9_glnxa64.zip && \
+    rm -f MATLAB_Runtime_R2019a_Update_9_glnxa64.zip && \
+    ./install -destinationFolder /opt/mcr -agreeToLicense yes -mode silent && \
+    cd / && \
     rm -rf mcr-install  
 
 # Configure environment variables for MCR  
 ENV LD_LIBRARY_PATH /opt/mcr/v96/runtime/glnxa64:/opt/mcr/v96/bin/glnxa64:/opt/mcr/v96/sys/os/glnxa64:/opt/mcr/v96/extern/bin/glnxa64  
 
 ENV XAPPLRESDIR /etc/X11/app-defaults  
+
+# Creating a variable to test the correct installation and dump VersionInfo.xml
+ENV MCR_MASTER_PATH /opt/mcr/v96
diff --git a/R2019b/Dockerfile b/R2019b/Dockerfile
@@ -23,27 +23,30 @@ FROM debian:buster-slim
 MAINTAINER Riccardo De Martis <riccardo@demartis.it>  
 ENV DEBIAN_FRONTEND noninteractive  
 
-RUN apt-get -q update && \  
-    apt-get install -q -y --no-install-recommends \  
-      xorg \  
-      unzip \  
-      wget \  
-      curl && \  
-    apt-get clean && \  
+RUN apt-get -q update && \
+    apt-get install -q -y --no-install-recommends \
+      xorg \
+      unzip \
+      wget \
+      curl && \
+    apt-get clean && \
     rm -rf /var/lib/apt/lists/*  
 
 # Download the MCR from MathWorks site an install with -mode silent  
-RUN mkdir /mcr-install && \  
-    mkdir /opt/mcr && \  
-    cd /mcr-install && \  
-    wget --no-check-certificate -q https://ssd.mathworks.com/supportfiles/downloads/R2019b/Release/9/deployment_files/installer/complete/glnxa64/MATLAB_Runtime_R2019b_Update_9_glnxa64.zip && \  
-    unzip -q MATLAB_Runtime_R2019b_Update_9_glnxa64.zip && \  
-    rm -f MATLAB_Runtime_R2019b_Update_9_glnxa64.zip && \  
-    ./install -destinationFolder /opt/mcr -agreeToLicense yes -mode silent && \  
-    cd / && \  
+RUN mkdir /mcr-install && \
+    mkdir /opt/mcr && \
+    cd /mcr-install && \
+    wget --no-check-certificate -q https://ssd.mathworks.com/supportfiles/downloads/R2019b/Release/9/deployment_files/installer/complete/glnxa64/MATLAB_Runtime_R2019b_Update_9_glnxa64.zip && \
+    unzip -q MATLAB_Runtime_R2019b_Update_9_glnxa64.zip && \
+    rm -f MATLAB_Runtime_R2019b_Update_9_glnxa64.zip && \
+    ./install -destinationFolder /opt/mcr -agreeToLicense yes -mode silent && \
+    cd / && \
     rm -rf mcr-install  
 
 # Configure environment variables for MCR  
 ENV LD_LIBRARY_PATH /opt/mcr/v97/runtime/glnxa64:/opt/mcr/v97/bin/glnxa64:/opt/mcr/v97/sys/os/glnxa64:/opt/mcr/v97/extern/bin/glnxa64  
 
 ENV XAPPLRESDIR /etc/X11/app-defaults  
+
+# Creating a variable to test the correct installation and dump VersionInfo.xml
+ENV MCR_MASTER_PATH /opt/mcr/v97
diff --git a/R2020a/Dockerfile b/R2020a/Dockerfile
@@ -23,27 +23,30 @@ FROM debian:buster-slim
 MAINTAINER Riccardo De Martis <riccardo@demartis.it>  
 ENV DEBIAN_FRONTEND noninteractive  
 
-RUN apt-get -q update && \  
-    apt-get install -q -y --no-install-recommends \  
-      xorg \  
-      unzip \  
-      wget \  
-      curl && \  
-    apt-get clean && \  
+RUN apt-get -q update && \
+    apt-get install -q -y --no-install-recommends \
+      xorg \
+      unzip \
+      wget \
+      curl && \
+    apt-get clean && \
     rm -rf /var/lib/apt/lists/*  
 
 # Download the MCR from MathWorks site an install with -mode silent  
-RUN mkdir /mcr-install && \  
-    mkdir /opt/mcr && \  
-    cd /mcr-install && \  
-    wget --no-check-certificate -q https://ssd.mathworks.com/supportfiles/downloads/R2020a/Release/8/deployment_files/installer/complete/glnxa64/MATLAB_Runtime_R2020a_Update_8_glnxa64.zip && \  
-    unzip -q MATLAB_Runtime_R2020a_Update_8_glnxa64.zip && \  
-    rm -f MATLAB_Runtime_R2020a_Update_8_glnxa64.zip && \  
-    ./install -destinationFolder /opt/mcr -agreeToLicense yes -mode silent && \  
-    cd / && \  
+RUN mkdir /mcr-install && \
+    mkdir /opt/mcr && \
+    cd /mcr-install && \
+    wget --no-check-certificate -q https://ssd.mathworks.com/supportfiles/downloads/R2020a/Release/8/deployment_files/installer/complete/glnxa64/MATLAB_Runtime_R2020a_Update_8_glnxa64.zip && \
+    unzip -q MATLAB_Runtime_R2020a_Update_8_glnxa64.zip && \
+    rm -f MATLAB_Runtime_R2020a_Update_8_glnxa64.zip && \
+    ./install -destinationFolder /opt/mcr -agreeToLicense yes -mode silent && \
+    cd / && \
     rm -rf mcr-install  
 
 # Configure environment variables for MCR  
 ENV LD_LIBRARY_PATH /opt/mcr/v98/runtime/glnxa64:/opt/mcr/v98/bin/glnxa64:/opt/mcr/v98/sys/os/glnxa64:/opt/mcr/v98/extern/bin/glnxa64  
 
 ENV XAPPLRESDIR /etc/X11/app-defaults  
+
+# Creating a variable to test the correct installation and dump VersionInfo.xml
+ENV MCR_MASTER_PATH /opt/mcr/v98
diff --git a/R2020b/Dockerfile b/R2020b/Dockerfile
@@ -23,27 +23,30 @@ FROM debian:buster-slim
 MAINTAINER Riccardo De Martis <riccardo@demartis.it>  
 ENV DEBIAN_FRONTEND noninteractive  
 
-RUN apt-get -q update && \  
-    apt-get install -q -y --no-install-recommends \  
-      xorg \  
-      unzip \  
-      wget \  
-      curl && \  
-    apt-get clean && \  
+RUN apt-get -q update && \
+    apt-get install -q -y --no-install-recommends \
+      xorg \
+      unzip \
+      wget \
+      curl && \
+    apt-get clean && \
     rm -rf /var/lib/apt/lists/*  
 
 # Download the MCR from MathWorks site an install with -mode silent  
-RUN mkdir /mcr-install && \  
-    mkdir /opt/mcr && \  
-    cd /mcr-install && \  
-    wget --no-check-certificate -q https://ssd.mathworks.com/supportfiles/downloads/R2020b/Release/8/deployment_files/installer/complete/glnxa64/MATLAB_Runtime_R2020b_Update_8_glnxa64.zip && \  
-    unzip -q MATLAB_Runtime_R2020b_Update_8_glnxa64.zip && \  
-    rm -f MATLAB_Runtime_R2020b_Update_8_glnxa64.zip && \  
-    ./install -destinationFolder /opt/mcr -agreeToLicense yes -mode silent && \  
-    cd / && \  
+RUN mkdir /mcr-install && \
+    mkdir /opt/mcr && \
+    cd /mcr-install && \
+    wget --no-check-certificate -q https://ssd.mathworks.com/supportfiles/downloads/R2020b/Release/8/deployment_files/installer/complete/glnxa64/MATLAB_Runtime_R2020b_Update_8_glnxa64.zip && \
+    unzip -q MATLAB_Runtime_R2020b_Update_8_glnxa64.zip && \
+    rm -f MATLAB_Runtime_R2020b_Update_8_glnxa64.zip && \
+    ./install -destinationFolder /opt/mcr -agreeToLicense yes -mode silent && \
+    cd / && \
     rm -rf mcr-install  
 
 # Configure environment variables for MCR  
 ENV LD_LIBRARY_PATH /opt/mcr/v99/runtime/glnxa64:/opt/mcr/v99/bin/glnxa64:/opt/mcr/v99/sys/os/glnxa64:/opt/mcr/v99/extern/bin/glnxa64  
 
 ENV XAPPLRESDIR /etc/X11/app-defaults  
+
+# Creating a variable to test the correct installation and dump VersionInfo.xml
+ENV MCR_MASTER_PATH /opt/mcr/v99
diff --git a/R2021a/Dockerfile b/R2021a/Dockerfile
@@ -23,27 +23,30 @@ FROM debian:buster-slim
 MAINTAINER Riccardo De Martis <riccardo@demartis.it>  
 ENV DEBIAN_FRONTEND noninteractive  
 
-RUN apt-get -q update && \  
-    apt-get install -q -y --no-install-recommends \  
-      xorg \  
-      unzip \  
-      wget \  
-      curl && \  
-    apt-get clean && \  
+RUN apt-get -q update && \
+    apt-get install -q -y --no-install-recommends \
+      xorg \
+      unzip \
+      wget \
+      curl && \
+    apt-get clean && \
     rm -rf /var/lib/apt/lists/*  
 
 # Download the MCR from MathWorks site an install with -mode silent  
-RUN mkdir /mcr-install && \  
-    mkdir /opt/mcr && \  
-    cd /mcr-install && \  
-    wget --no-check-certificate -q https://ssd.mathworks.com/supportfiles/downloads/R2021a/Release/8/deployment_files/installer/complete/glnxa64/MATLAB_Runtime_R2021a_Update_8_glnxa64.zip && \  
-    unzip -q MATLAB_Runtime_R2021a_Update_8_glnxa64.zip && \  
-    rm -f MATLAB_Runtime_R2021a_Update_8_glnxa64.zip && \  
-    ./install -destinationFolder /opt/mcr -agreeToLicense yes -mode silent && \  
-    cd / && \  
+RUN mkdir /mcr-install && \
+    mkdir /opt/mcr && \
+    cd /mcr-install && \
+    wget --no-check-certificate -q https://ssd.mathworks.com/supportfiles/downloads/R2021a/Release/8/deployment_files/installer/complete/glnxa64/MATLAB_Runtime_R2021a_Update_8_glnxa64.zip && \
+    unzip -q MATLAB_Runtime_R2021a_Update_8_glnxa64.zip && \
+    rm -f MATLAB_Runtime_R2021a_Update_8_glnxa64.zip && \
+    ./install -destinationFolder /opt/mcr -agreeToLicense yes -mode silent && \
+    cd / && \
     rm -rf mcr-install  
 
 # Configure environment variables for MCR  
 ENV LD_LIBRARY_PATH /opt/mcr/v910/runtime/glnxa64:/opt/mcr/v910/bin/glnxa64:/opt/mcr/v910/sys/os/glnxa64:/opt/mcr/v910/extern/bin/glnxa64  
 
 ENV XAPPLRESDIR /etc/X11/app-defaults  
+
+# Creating a variable to test the correct installation and dump VersionInfo.xml
+ENV MCR_MASTER_PATH /opt/mcr/v910
diff --git a/R2021b-meshlab/Dockerfile b/R2021b-meshlab/Dockerfile
@@ -21,7 +21,7 @@
 # 3D digitization tools/devices and for preparing models for 3D printing.
 #
 # @author Riccardo De Martis 
-# @creation 2023-May-11
+# @creation 2023-Nov-14
 # @link https://github.com/demartis/matlab_runtime_docker  
 #
 

diff --git a/R2021b/Dockerfile b/R2021b/Dockerfile
@@ -15,35 +15,38 @@
 # See https://www.mathworks.com/products/compiler/matlab-runtime.html for more info.  
 #  
 # @author Riccardo De Martis
-# @creation 2023-May-11  
+# @creation 2023-Nov-14  
 # @link https://github.com/demartis/matlab_runtime_docker  
 #  
 
 FROM debian:buster-slim  
 MAINTAINER Riccardo De Martis <riccardo@demartis.it>  
 ENV DEBIAN_FRONTEND noninteractive  
 
-RUN apt-get -q update && \  
-    apt-get install -q -y --no-install-recommends \  
-      xorg \  
-      unzip \  
-      wget \  
-      curl && \  
-    apt-get clean && \  
+RUN apt-get -q update && \
+    apt-get install -q -y --no-install-recommends \
+      xorg \
+      unzip \
+      wget \
+      curl && \
+    apt-get clean && \
     rm -rf /var/lib/apt/lists/*  
 
 # Download the MCR from MathWorks site an install with -mode silent  
-RUN mkdir /mcr-install && \  
-    mkdir /opt/mcr && \  
-    cd /mcr-install && \  
-    wget --no-check-certificate -q https://ssd.mathworks.com/supportfiles/downloads/R2021b/Release/6/deployment_files/installer/complete/glnxa64/MATLAB_Runtime_R2021b_Update_6_glnxa64.zip && \  
-    unzip -q MATLAB_Runtime_R2021b_Update_6_glnxa64.zip && \  
-    rm -f MATLAB_Runtime_R2021b_Update_6_glnxa64.zip && \  
-    ./install -destinationFolder /opt/mcr -agreeToLicense yes -mode silent && \  
-    cd / && \  
+RUN mkdir /mcr-install && \
+    mkdir /opt/mcr && \
+    cd /mcr-install && \
+    wget --no-check-certificate -q https://ssd.mathworks.com/supportfiles/downloads/R2021b/Release/7/deployment_files/installer/complete/glnxa64/MATLAB_Runtime_R2021b_Update_7_glnxa64.zip && \
+    unzip -q MATLAB_Runtime_R2021b_Update_7_glnxa64.zip && \
+    rm -f MATLAB_Runtime_R2021b_Update_7_glnxa64.zip && \
+    ./install -destinationFolder /opt/mcr -agreeToLicense yes -mode silent && \
+    cd / && \
     rm -rf mcr-install  
 
 # Configure environment variables for MCR  
 ENV LD_LIBRARY_PATH /opt/mcr/v911/runtime/glnxa64:/opt/mcr/v911/bin/glnxa64:/opt/mcr/v911/sys/os/glnxa64:/opt/mcr/v911/extern/bin/glnxa64  
 
 ENV XAPPLRESDIR /etc/X11/app-defaults  
+
+# Creating a variable to test the correct installation and dump VersionInfo.xml
+ENV MCR_MASTER_PATH /opt/mcr/v911
diff --git a/R2022a-meshlab/Dockerfile b/R2022a-meshlab/Dockerfile
@@ -21,7 +21,7 @@
 # 3D digitization tools/devices and for preparing models for 3D printing.
 #
 # @author Riccardo De Martis 
-# @creation 2023-May-11
+# @creation 2023-Nov-14
 # @link https://github.com/demartis/matlab_runtime_docker  
 #
 

diff --git a/R2022a/Dockerfile b/R2022a/Dockerfile
@@ -15,35 +15,38 @@
 # See https://www.mathworks.com/products/compiler/matlab-runtime.html for more info.  
 #  
 # @author Riccardo De Martis
-# @creation 2023-May-11  
+# @creation 2023-Nov-14  
 # @link https://github.com/demartis/matlab_runtime_docker  
 #  
 
 FROM debian:buster-slim  
 MAINTAINER Riccardo De Martis <riccardo@demartis.it>  
 ENV DEBIAN_FRONTEND noninteractive  
 
-RUN apt-get -q update && \  
-    apt-get install -q -y --no-install-recommends \  
-      xorg \  
-      unzip \  
-      wget \  
-      curl && \  
-    apt-get clean && \  
+RUN apt-get -q update && \
+    apt-get install -q -y --no-install-recommends \
+      xorg \
+      unzip \
+      wget \
+      curl && \
+    apt-get clean && \
     rm -rf /var/lib/apt/lists/*  
 
 # Download the MCR from MathWorks site an install with -mode silent  
-RUN mkdir /mcr-install && \  
-    mkdir /opt/mcr && \  
-    cd /mcr-install && \  
-    wget --no-check-certificate -q https://ssd.mathworks.com/supportfiles/downloads/R2022a/Release/6/deployment_files/installer/complete/glnxa64/MATLAB_Runtime_R2022a_Update_6_glnxa64.zip && \  
-    unzip -q MATLAB_Runtime_R2022a_Update_6_glnxa64.zip && \  
-    rm -f MATLAB_Runtime_R2022a_Update_6_glnxa64.zip && \  
-    ./install -destinationFolder /opt/mcr -agreeToLicense yes -mode silent && \  
-    cd / && \  
+RUN mkdir /mcr-install && \
+    mkdir /opt/mcr && \
+    cd /mcr-install && \
+    wget --no-check-certificate -q https://ssd.mathworks.com/supportfiles/downloads/R2022a/Release/7/deployment_files/installer/complete/glnxa64/MATLAB_Runtime_R2022a_Update_7_glnxa64.zip && \
+    unzip -q MATLAB_Runtime_R2022a_Update_7_glnxa64.zip && \
+    rm -f MATLAB_Runtime_R2022a_Update_7_glnxa64.zip && \
+    ./install -destinationFolder /opt/mcr -agreeToLicense yes -mode silent && \
+    cd / && \
     rm -rf mcr-install  
 
 # Configure environment variables for MCR  
 ENV LD_LIBRARY_PATH /opt/mcr/v912/runtime/glnxa64:/opt/mcr/v912/bin/glnxa64:/opt/mcr/v912/sys/os/glnxa64:/opt/mcr/v912/extern/bin/glnxa64  
 
 ENV XAPPLRESDIR /etc/X11/app-defaults  
+
+# Creating a variable to test the correct installation and dump VersionInfo.xml
+ENV MCR_MASTER_PATH /opt/mcr/v912
diff --git a/R2022b-meshlab/Dockerfile b/R2022b-meshlab/Dockerfile
@@ -21,7 +21,7 @@
 # 3D digitization tools/devices and for preparing models for 3D printing.
 #
 # @author Riccardo De Martis 
-# @creation 2023-May-11
+# @creation 2023-Nov-14
 # @link https://github.com/demartis/matlab_runtime_docker  
 #