Pin ubuntu and gcc/g++ versions for mathworks/matlab base images

Author: michaelmcdonnellmw

matlab/Dockerfile

@@ -1,4 +1,4 @@
-# Copyright 2024 The MathWorks, Inc.
+# Copyright 2024-2025 The MathWorks, Inc.
 
 # This Dockerfile allows you to build either the MATLAB Container image or the MATLAB Deep Learning Container image.
 
@@ -15,26 +15,35 @@ ARG MPM_ADDITIONAL_FLAGS=""
 # Specify the base repository to pull MATLAB dependencies from.
 ARG MATLAB_DEPS_IMAGE=""
 
+# Pin to a specific Ubuntu version to ensure images can be updated independently of defaults for matlab-deps.
+# Should be a ubuntu-based image e.g. `ubuntu20.04`
+# Leave blank to use the default OS
+ARG MATLAB_DEPS_OS=""
+
 # Specify the URL of the managed version of MathWorks Service Host.
 ARG MATHWORKS_SERVICE_HOST_INSTALL_URL=""
 
 # Specify any additional packages to install via apt-get.
 ARG APT_ADDITIONAL_PACKAGES=""
 ARG APT_ADDITIONAL_PACKAGES_VNC=""
 
+ARG GCC=""
+ARG GPP=""
+
 # Specify MATLAB Install Location.
 ARG MATLAB_INSTALL_LOCATION="/opt/matlab/${MATLAB_RELEASE}"
 
 # When you start the build stage, this Dockerfile by default uses the Ubuntu-based matlab-deps image.
 # To check the available matlab-deps images, see: https://hub.docker.com/r/mathworks/matlab-deps
-FROM ${MATLAB_DEPS_IMAGE}:${MATLAB_RELEASE} AS build
-
+FROM ${MATLAB_DEPS_IMAGE}:${MATLAB_RELEASE}${MATLAB_DEPS_OS:+-$MATLAB_DEPS_OS} AS build
 ARG MATLAB_RELEASE
 ARG MATLAB_INSTALL_LOCATION
 ARG MPM_ADDITIONAL_FLAGS
 ARG MATHWORKS_SERVICE_HOST_INSTALL_URL
 ARG APT_ADDITIONAL_PACKAGES
 ARG APT_ADDITIONAL_PACKAGES_VNC
+ARG GCC
+ARG GPP
 
 # Install extra tools not included in `matlab-deps`.
 RUN export DEBIAN_FRONTEND=noninteractive \
@@ -44,8 +53,8 @@ RUN export DEBIAN_FRONTEND=noninteractive \
     # Requirements for mpm
     ca-certificates \
     # Requirements for mex generation
-    gcc \
-    g++ \
+    ${GCC} \
+    ${GPP} \
     # Requirements for VNC
     libglu1-mesa \
     libosmesa6 \
@@ -75,6 +84,10 @@ RUN export DEBIAN_FRONTEND=noninteractive \
     && apt-get -y autoremove \
     && rm -rf /var/lib/apt/lists/*
 
+# Set the gcc and g++ soft links
+RUN ln -s $(which ${GCC}) /usr/bin/gcc && \
+    ln -s $(which ${GPP}) /usr/bin/g++
+
 ################################################################################
 # Setup VNC
 ################################################################################

matlab/docker-bake.hcl

@@ -1,4 +1,4 @@
-# Copyright 2024 The MathWorks, Inc.
+# Copyright 2024-2025 The MathWorks, Inc.
 
 # General Configuration variables
 
@@ -10,6 +10,10 @@ variable "MATLAB_RELEASE" {
   default = "${LATEST_RELEASE}"
 }
 
+variable "MATLAB_DEPS_OS" {
+  default = "ubuntu22.04"
+}
+
 variable "MPM_ADDITIONAL_FLAGS" {
   default = ""
 }
@@ -28,17 +32,30 @@ variable "APT_ADDITIONAL_PACKAGES_VNC" {
   default = "tigervnc-tools"
 }
 
+variable "GCC" {
+  # By default, this should match the version of gcc required by the latest MATLAB release.
+  default = "gcc-12"
+}
+
+variable "GPP" {
+  # By default, this should match the version of g++ required by the latest MATLAB release.
+  default = "g++-12"
+}
+
 variable "MATHWORKS_SERVICE_HOST_INSTALL_URL" {
   default = "https://www.mathworks.com/MathWorksServiceHost/glnxa64/install_managed_msh.sh"
 }
 
 variable "common_args" {
   default = {
     MATLAB_DEPS_IMAGE = "${MATLAB_DEPS_IMAGE}"
+    MATLAB_DEPS_OS = "${MATLAB_DEPS_OS}"
     MATLAB_RELEASE = "${MATLAB_RELEASE}"
     MPM_ADDITIONAL_FLAGS = "${MPM_ADDITIONAL_FLAGS}"
     APT_ADDITIONAL_PACKAGES = "${APT_ADDITIONAL_PACKAGES}"
     APT_ADDITIONAL_PACKAGES_VNC = "${APT_ADDITIONAL_PACKAGES_VNC}"
+    GCC = "${GCC}"
+    GPP = "${GPP}"
     MATHWORKS_SERVICE_HOST_INSTALL_URL = "${MATHWORKS_SERVICE_HOST_INSTALL_URL}"
   }
 }

matlab/release-config/R2023a.env.hcl

@@ -1,9 +1,15 @@
-# Copyright 2024 The MathWorks, Inc.
+# Copyright 2024-2025 The MathWorks, Inc.
 
 MATLAB_RELEASE="R2023a"
 
+MATLAB_DEPS_OS="ubuntu20.04"
+
+# Using gcc-9 instead of gcc-11 as it is not available on Ubuntu 20.04
+GCC="gcc-9"
+GPP="g++-9"
+
 # Ubuntu 20.04 requires python3.8-venv when using pipx
 APT_ADDITIONAL_PACKAGES="python3.8-venv"
 
 # Ubuntu 20.04 has vncpasswd provided by tigervnc-common so don't need tigervnc-tools
-APT_ADDITIONAL_PACKAGES_VNC=""
+APT_ADDITIONAL_PACKAGES_VNC=""

matlab/release-config/R2023b.env.hcl

@@ -1,3 +1,8 @@
-# Copyright 2024 The MathWorks, Inc.
+# Copyright 2024-2025 The MathWorks, Inc.
 
 MATLAB_RELEASE="R2023b"
+
+MATLAB_DEPS_OS="ubuntu22.04"
+
+GCC="gcc-11"
+GPP="g++-11"

matlab/release-config/R2024a.env.hcl

@@ -1,3 +1,8 @@
-# Copyright 2024 The MathWorks, Inc.
+# Copyright 2024-2025 The MathWorks, Inc.
 
 MATLAB_RELEASE="R2024a"
+
+MATLAB_DEPS_OS="ubuntu22.04"
+
+GCC="gcc-12"
+GPP="g++-12"

matlab/release-config/R2024b.env.hcl

@@ -1,3 +1,8 @@
-# Copyright 2024 The MathWorks, Inc.
+# Copyright 2024-2025 The MathWorks, Inc.
 
 MATLAB_RELEASE="R2024b"
+
+MATLAB_DEPS_OS="ubuntu22.04"
+
+GCC="gcc-12"
+GPP="g++-12"