Updates repository to use a single Dockerfile to build all combinations.

Author: prabhakk-mw

.github/workflows/build-and-publish-docker-image.yml

@@ -31,6 +31,10 @@ on:
         description: 'If true, then an additional tag without OS information is generated.'
         required: true
         type: boolean
+      build_args:
+        description: 'String Array of comma separated build-args. Ex ["val1=1", "val2=2", "val3=3"] '
+        required: false
+        type: string
 
 jobs:
   build-push-image:
@@ -49,6 +53,12 @@ jobs:
           && echo "TAG_RELEASE_AND_OS_CAMEL_CASE=${LOWER_CASE_MATLAB_RELEASE}-${{ inputs.os_info_tag }}" >> "$GITHUB_OUTPUT" \
           && echo "TAG_RELEASE_AND_OS_PASCAL_CASE=${LOWER_CASE_MATLAB_RELEASE^}-${{ inputs.os_info_tag }}" >> "$GITHUB_OUTPUT"
 
+      - name: Create list of build args from array of strings
+        id: build-args-as-list
+        uses: lucaspinheirogit/[email protected]
+        with:
+              stringArray: ${{ inputs.build_args }}
+
       # See here for example: https://docs.docker.com/build/ci/github-actions/push-multi-registries/
       # -
       #   name: Login to Docker Hub
@@ -72,19 +82,21 @@ jobs:
         if: ${{ inputs.is_default_os == false }}
         uses: docker/build-push-action@v4
         with:
+          build-args: ${{ steps.build-args-as-list.outputs.stringList }}
           context: ${{ inputs.docker_build_context }}
           platforms: linux/amd64
           push: true
           tags: |
             ${{ inputs.base_image_name }}:${{ steps.setup_image_tags.outputs.TAG_RELEASE_AND_OS_CAMEL_CASE }}
             ${{ inputs.base_image_name }}:${{ steps.setup_image_tags.outputs.TAG_RELEASE_AND_OS_PASCAL_CASE }}
-          build-args: MATLAB_RELEASE=${{ inputs.matlab_release_tag }}
 
+          
       # Example tags: r2023a-ubuntu20.04, R2023a-ubuntu20.04, r2023a, R2023a
       - name: Build & Push Image for latest OS
         if: ${{ inputs.is_default_os == true }}
         uses: docker/build-push-action@v4
         with:
+          build-args: ${{ steps.build-args-as-list.outputs.stringList }}
           context: ${{ inputs.docker_build_context }}
           platforms: linux/amd64
           push: true
@@ -93,6 +105,5 @@ jobs:
             ${{ inputs.base_image_name }}:${{ steps.setup_image_tags.outputs.TAG_RELEASE_ONLY_PASCAL_CASE }}
             ${{ inputs.base_image_name }}:${{ steps.setup_image_tags.outputs.TAG_RELEASE_AND_OS_CAMEL_CASE }}
             ${{ inputs.base_image_name }}:${{ steps.setup_image_tags.outputs.TAG_RELEASE_AND_OS_PASCAL_CASE }}
-          build-args: MATLAB_RELEASE=${{ inputs.matlab_release_tag }}
 
 

.github/workflows/matlab-dockerfile.yml renamed to .github/workflows/jupyter-matlab-notebook.yaml

@@ -1,6 +1,6 @@
-# Copyright 2023-2024 The MathWorks, Inc.
-# Build & Publish matlab/Dockerfile
-name: matlab/Dockerfile
+# Copyright 2024 The MathWorks, Inc.
+# Build & Publish jupyter-matlab-notebook
+name: jupyter-matlab-notebook
 
 # Define when builds will occur:
 on:
@@ -9,7 +9,8 @@ on:
     branches:
       - 'main'
     paths:
-      - 'matlab/Dockerfile'
+      - 'Dockerfile'
+      - '.github/workflows/**'
 
   # Run at 00:00 on every Monday (1st Day of the Week) (See: crontab.guru)
   schedule:
@@ -22,12 +23,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        matlab_release_tag: [r2024b, r2024a, r2023b, r2023a, r2022b]
+        matlab_release_tag: [R2024b, R2024a, R2023b, R2023a, R2022b]
     uses: ./.github/workflows/build-and-publish-docker-image.yml
     secrets: inherit
     with:
-        docker_build_context: './matlab'
+        docker_build_context: '.'
         base_image_name: ghcr.io/${{ github.repository }}/jupyter-matlab-notebook
         os_info_tag: 'ubuntu22.04'
         matlab_release_tag: ${{ matrix.matlab_release_tag }}
         is_default_os: true
+        build_args: '["MATLAB_RELEASE=${{ matrix.matlab_release_tag }}", "INSTALL_VNC=1", "INSTALL_MATLABENGINE=1", "MOUNT_MATLAB=1"]'

.github/workflows/matlab-mounted-dockerfile.yml renamed to .github/workflows/jupyter-mounted-matlab-notebook.yml

@@ -1,6 +1,6 @@
-# Copyright 2023-2024 The MathWorks, Inc.
-# Build & Publish matlab/Dockerfile.mounted
-name: matlab/Dockerfile.mounted
+# Copyright 2024 The MathWorks, Inc.
+# Build & Publish jupyter-mounted-matlab-notebook
+name: jupyter-mounted-matlab-notebook
 
 # Define when builds will occur:
 on:
@@ -9,7 +9,8 @@ on:
     branches:
       - 'main'
     paths:
-      - 'matlab/Dockerfile.mounted'
+      - 'Dockerfile'
+      - '.github/workflows/**'
 
   # Run at 00:00 on every Monday (1st Day of the Week) (See: crontab.guru)
   schedule:
@@ -22,12 +23,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        matlab_release_tag: [r2024b, r2024a, r2023b, r2023a, r2022b]
+        matlab_release_tag: [R2024b, R2024a, R2023b, R2023a, R2022b]
     uses: ./.github/workflows/build-and-publish-docker-image.yml
     secrets: inherit
     with:
-        docker_build_context: './matlab'
+        docker_build_context: '.'
         base_image_name: ghcr.io/${{ github.repository }}/jupyter-mounted-matlab-notebook
         os_info_tag: 'ubuntu22.04'
         matlab_release_tag: ${{ matrix.matlab_release_tag }}
         is_default_os: true
+        build_args: '["MATLAB_RELEASE=${{ matrix.matlab_release_tag }}", "INSTALL_VNC=1", "INSTALL_MATLABENGINE=1", "MOUNT_MATLAB=1"]'