Skip to content

Commit d61d518

Browse files
committed
Support for R2024b.
1 parent b9add72 commit d61d518

File tree

11 files changed

+58
-50
lines changed

11 files changed

+58
-50
lines changed

matlab-vnc/Dockerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# on a base image of jupyter/base-notebook:python-3.xx
66

77
## Sample Build Command:
8-
# docker build --build-arg MATLAB_RELEASE=r2024a \
8+
# docker build --build-arg MATLAB_RELEASE=R2024b \
99
# --build-arg MATLAB_PRODUCT_LIST="MATLAB Deep_Learning_Toolbox Symbolic_Math_Toolbox"\
1010
# --build-arg LICENSE_SERVER=12345@hostname.com \
1111
# -t my_matlab_image_name .
@@ -15,6 +15,7 @@
1515
# MATLAB RELEASE | Supported Python Versions | OS supported by matlab-deps|Supported by this Dockerfile |
1616
# ---------------| (MATLAB Engine for Python) |----------------------------|---------------------------------|
1717
# ---------------|----------------------------|----------------------------|---------------------------------|
18+
# R2024b | 3.9, 3.10, 3.11, 3.12 | Ubuntu 20.04 & 22.04 | Yes |
1819
# R2024a | 3.9, 3.10, 3.11 | Ubuntu 20.04 & 22.04 | Yes |
1920
# R2023b | 3.9, 3.10, 3.11 | Ubuntu 20.04 & 22.04 | Yes |
2021
# R2023a | 3.8, 3.9, 3.10 | Ubuntu 20.04 & 22.04 | Yes |
@@ -24,11 +25,11 @@
2425
# R2021a | 3.8 | Ubuntu 20.04 | No, use ubuntu20.04/Dockerfile |
2526
# R2020b | 3.8 | Ubuntu 20.04 | No, use ubuntu20.04/Dockerfile |
2627

27-
# Specify release of MATLAB to build. (use lowercase, default is r2024a)
28-
ARG MATLAB_RELEASE=r2024a
28+
# Specify release of MATLAB to build. (Default is R2024b)
29+
ARG MATLAB_RELEASE=R2024b
2930

3031
# Specify version of python thats used by jupyter/base-notebbok
31-
# Using python 3.10 as default as it is the latest version compatible with MATLAB Engine for Python in R2024a, R2023b, R2023a & R2022b
32+
# Using python 3.10 as default as it is the latest version compatible with MATLAB Engine for Python in R2024b to R2022b
3233
ARG PYTHON_VERSION=3.10
3334

3435
# Specify the list of products to install into MATLAB,
@@ -86,7 +87,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && apt-get update \
8687
xubuntu-icon-theme \
8788
curl \
8889
xscreensaver \
89-
&& wget ${MATLAB_DEPS_REQUIREMENTS_FILE} -O ${MATLAB_DEPS_REQUIREMENTS_FILE_NAME} \
90+
&& wget $(echo ${MATLAB_DEPS_REQUIREMENTS_FILE} | tr "[:upper:]" "[:lower:]") -O ${MATLAB_DEPS_REQUIREMENTS_FILE_NAME} \
9091
&& xargs -a ${MATLAB_DEPS_REQUIREMENTS_FILE_NAME} -r apt-get install --no-install-recommends -y \
9192
&& apt-get remove -y gnome-screensaver \
9293
&& apt-get clean \

matlab-vnc/Dockerfile.mounted

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Folder with the MATLAB installation needs to be mounted into the image at /opt/matlab
66

77
## Sample Build Command:
8-
# docker build --build-arg MATLAB_RELEASE=r2024a \
8+
# docker build --build-arg MATLAB_RELEASE=R2024b \
99
# --build-arg LICENSE_SERVER=12345@hostname.com \
1010
# -t my_matlab_image_name .
1111

@@ -14,6 +14,7 @@
1414
# MATLAB RELEASE | Supported Python Versions | OS supported by matlab-deps|Supported by this Dockerfile |
1515
# ---------------| (MATLAB Engine for Python) |----------------------------|---------------------------------|
1616
# ---------------|----------------------------|----------------------------|---------------------------------|
17+
# R2024b | 3.9, 3.10, 3.11, 3.12 | Ubuntu 20.04 & 22.04 | Yes |
1718
# R2024a | 3.9, 3.10, 3.11 | Ubuntu 20.04 & 22.04 | Yes |
1819
# R2023b | 3.9, 3.10, 3.11 | Ubuntu 20.04 & 22.04 | Yes |
1920
# R2023a | 3.8, 3.9, 3.10 | Ubuntu 20.04 & 22.04 | Yes |
@@ -23,12 +24,12 @@
2324
# R2021a | 3.8 | Ubuntu 20.04 | No, use ubuntu20.04/Dockerfile.mounted |
2425
# R2020b | 3.8 | Ubuntu 20.04 | No, use ubuntu20.04/Dockerfile.mounted |
2526

26-
# Specify release of MATLAB being mounted. (use lowercase, default is r2024a)
27+
# Specify release of MATLAB being mounted. (use lowercase, default is R2024b)
2728
# Used to fetch & install MATLAB's s/w dependencies
28-
ARG MATLAB_RELEASE=r2024a
29+
ARG MATLAB_RELEASE=R2024b
2930

3031
# Specify version of python thats used by jupyter/base-notebbok
31-
# Using python 3.10 as default as it is the latest version compatible with MATLAB Engine for Python in R2024a, R2023b, R2023a & R2022b
32+
# Using python 3.10 as default as it is the latest version compatible with MATLAB Engine for Python in R2024b to R2022b
3233
ARG PYTHON_VERSION=3.10
3334

3435
# Optional Network License Server information in the form of port@hostname

matlab/Dockerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# For complete listing, see https://github.com/mathworks-ref-arch/container-images/tree/main/matlab-deps
99

1010
## Sample Build Command:
11-
# docker build --build-arg MATLAB_RELEASE=r2024a \
11+
# docker build --build-arg MATLAB_RELEASE=r2024b \
1212
# --build-arg PYTHON_VERSION=3.11 \
1313
# --build-arg MATLAB_PRODUCT_LIST="MATLAB Deep_Learning_Toolbox Symbolic_Math_Toolbox"\
1414
# --build-arg LICENSE_SERVER=12345@hostname.com \
@@ -19,6 +19,7 @@
1919
# MATLAB RELEASE | Supported Python Versions | OS supported by matlab-deps|Supported by this Dockerfile |
2020
# ---------------| (MATLAB Engine for Python) |----------------------------|---------------------------------|
2121
# ---------------|----------------------------|----------------------------|---------------------------------|
22+
# R2024b | 3.9, 3.10, 3.11, 3.12 | Ubuntu 22.04 & 20.04 | Yes |
2223
# R2024a | 3.9, 3.10, 3.11 | Ubuntu 22.04 & 20.04 | Yes |
2324
# R2023b | 3.9, 3.10, 3.11 | Ubuntu 22.04 & 20.04 | Yes |
2425
# R2023a | 3.8, 3.9, 3.10 | Ubuntu 22.04 & 20.04 | Yes |
@@ -28,11 +29,11 @@
2829
# R2021a | 3.8 | Ubuntu 20.04 | No, use ubuntu20.04/Dockerfile |
2930
# R2020b | 3.8 | Ubuntu 20.04 | No, use ubuntu20.04/Dockerfile |
3031

31-
# Specify release of MATLAB to build. (use lowercase, default is r2024a)
32-
ARG MATLAB_RELEASE=r2024a
32+
# Specify release of MATLAB to build. (Default is R2024b)
33+
ARG MATLAB_RELEASE=R2024b
3334

3435
# Specify version of python thats used by jupyter/base-notebbok
35-
# Using python 3.10 as default as it is the latest version compatible with MATLAB Engine for Python in R2024a, R2023b, R2023a & R2022b
36+
# Using python 3.10 as default as it is the latest version compatible with MATLAB Engine for Python in R2024b to R2022b.
3637
ARG PYTHON_VERSION=3.10
3738

3839
# Specify the list of products to install into MATLAB,
@@ -82,7 +83,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && apt-get update \
8283
ca-certificates \
8384
xvfb \
8485
git \
85-
&& wget ${MATLAB_DEPS_REQUIREMENTS_FILE} -O ${MATLAB_DEPS_REQUIREMENTS_FILE_NAME} \
86+
&& wget $(echo ${MATLAB_DEPS_REQUIREMENTS_FILE} | tr "[:upper:]" "[:lower:]") -O ${MATLAB_DEPS_REQUIREMENTS_FILE_NAME} \
8687
&& xargs -a ${MATLAB_DEPS_REQUIREMENTS_FILE_NAME} -r apt-get install --no-install-recommends -y \
8788
&& apt-get clean \
8889
&& apt-get -y autoremove \

matlab/Dockerfile.byoi

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
# For complete listing, see https://github.com/mathworks-ref-arch/container-images/tree/main/matlab-deps
99

1010
## Sample Build Command:
11-
# docker build --build-arg MATLAB_RELEASE=r2024a \
11+
# docker build --build-arg MATLAB_RELEASE=R2024b \
1212
# --build-arg PYTHON_VERSION=3.11 \
13-
# --build-arg MATLAB_IMAGE_NAME=mathworks/matlab:r2024a \
13+
# --build-arg MATLAB_IMAGE_NAME=mathworks/matlab:R2024b \
1414
# --build-arg LICENSE_SERVER=12345@hostname.com \
1515
# -t my_matlab_image_name -f Dockerfile.byoi .
1616

@@ -19,6 +19,7 @@
1919
# MATLAB RELEASE | Supported Python Versions | OS supported by matlab-deps|Supported by this Dockerfile |
2020
# ---------------| (MATLAB Engine for Python) |----------------------------|---------------------------------|
2121
# ---------------|----------------------------|----------------------------|---------------------------------|
22+
# R2024b | 3.9, 3.10, 3.11, 3.12 | Ubuntu 22.04 & 20.04 | Yes |
2223
# R2024a | 3.9, 3.10, 3.11 | Ubuntu 22.04 & 20.04 | Yes |
2324
# R2023b | 3.9, 3.10, 3.11 | Ubuntu 22.04 & 20.04 | Yes |
2425
# R2023a | 3.8, 3.9, 3.10 | Ubuntu 22.04 & 20.04 | Yes |
@@ -28,11 +29,11 @@
2829
# R2021a | 3.8 | Ubuntu 20.04 | No, use ubuntu20.04/Dockerfile.byoi |
2930
# R2020b | 3.8 | Ubuntu 20.04 | No, use ubuntu20.04/Dockerfile.byoi |
3031

31-
# Specify release of MATLAB to build. (use lowercase, default is r2024a)
32-
ARG MATLAB_RELEASE=r2024a
32+
# Specify release of MATLAB to build. (Default is R2024b)
33+
ARG MATLAB_RELEASE=R2024b
3334

3435
# Specify version of python thats used by jupyter/base-notebbok
35-
# Using python 3.10 as default as it is the latest version compatible with MATLAB Engine for Python in R2024a, R2023b, R2023a & R2022b
36+
# Using python 3.10 as default as it is the latest version compatible with MATLAB Engine for Python in R2024b to R2022b.
3637
ARG PYTHON_VERSION=3.10
3738

3839
# Specify name of Docker Image with MATLAB already installed.
@@ -110,7 +111,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && apt-get update \
110111
ca-certificates \
111112
xvfb \
112113
git \
113-
&& wget ${MATLAB_DEPS_REQUIREMENTS_FILE} -O ${MATLAB_DEPS_REQUIREMENTS_FILE_NAME} \
114+
&& wget $(echo ${MATLAB_DEPS_REQUIREMENTS_FILE} | tr "[:upper:]" "[:lower:]") -O ${MATLAB_DEPS_REQUIREMENTS_FILE_NAME} \
114115
&& xargs -a ${MATLAB_DEPS_REQUIREMENTS_FILE_NAME} -r apt-get install --no-install-recommends -y \
115116
&& apt-get clean \
116117
&& apt-get -y autoremove \

matlab/Dockerfile.mounted

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# For complete listing, see https://github.com/mathworks-ref-arch/container-images/tree/main/matlab-deps
99

1010
## Sample Build Command:
11-
# docker build --build-arg MATLAB_RELEASE=r2024a \
11+
# docker build --build-arg MATLAB_RELEASE=R2024b \
1212
# --build-arg PYTHON_VERSION=3.11 \
1313
# --build-arg LICENSE_SERVER=12345@hostname.com \
1414
# -t my_matlab_image_name .
@@ -18,6 +18,7 @@
1818
# MATLAB RELEASE | Supported Python Versions | OS supported by matlab-deps|Supported by this Dockerfile |
1919
# ---------------| (MATLAB Engine for Python) |----------------------------|---------------------------------|
2020
# ---------------|----------------------------|----------------------------|---------------------------------|
21+
# R2024b | 3.9, 3.10, 3.11, 3.12 | Ubuntu 22.04 & 20.04 | Yes |
2122
# R2024a | 3.9, 3.10, 3.11 | Ubuntu 22.04 & 20.04 | Yes |
2223
# R2023b | 3.9, 3.10, 3.11 | Ubuntu 22.04 & 20.04 | Yes |
2324
# R2023a | 3.8, 3.9, 3.10 | Ubuntu 22.04 & 20.04 | Yes |
@@ -27,12 +28,12 @@
2728
# R2021a | 3.8 | Ubuntu 20.04 | No, use ubuntu20.04/Dockerfile.mounted |
2829
# R2020b | 3.8 | Ubuntu 20.04 | No, use ubuntu20.04/Dockerfile.mounted |
2930

30-
# Specify release of MATLAB being mounted. (use lowercase, default is r2024a)
31+
# Specify release of MATLAB being mounted. (Default is R2024b)
3132
# Used to fetch & install MATLAB's s/w dependencies
32-
ARG MATLAB_RELEASE=r2024a
33+
ARG MATLAB_RELEASE=R2024b
3334

3435
# Specify version of python thats used by jupyter/base-notebbok
35-
# Using python 3.10 as default as it is the latest version compatible with MATLAB Engine for Python in R2024a, R2023b, R2023a & R2022b
36+
# Using python 3.10 as default as it is the latest version compatible with MATLAB Engine for Python in R2024b to R2022b.
3637
ARG PYTHON_VERSION=3.10
3738

3839
# Optional Network License Server information in the form of port@hostname
@@ -79,7 +80,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && apt-get update \
7980
wget \
8081
xvfb \
8182
git \
82-
&& wget ${MATLAB_DEPS_REQUIREMENTS_FILE} -O ${MATLAB_DEPS_REQUIREMENTS_FILE_NAME} \
83+
&& wget $(echo ${MATLAB_DEPS_REQUIREMENTS_FILE} | tr "[:upper:]" "[:lower:]") -O ${MATLAB_DEPS_REQUIREMENTS_FILE_NAME} \
8384
&& xargs -a ${MATLAB_DEPS_REQUIREMENTS_FILE_NAME} -r apt-get install --no-install-recommends -y \
8485
&& apt-get clean \
8586
&& apt-get -y autoremove \

matlab/README-byoi.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ Pass the name of your existing MATLAB image to docker build using the `build-tim
1111
`Dockerfile.byoi` supports the following build-time variables:
1212
| Argument Name | Default value | Effect |
1313
|---|---|---|
14-
| [MATLAB_RELEASE](#build-an-image-for-a-different-release-of-matlab) | r2024a | The MATLAB release you are using. Used to install its software dependencies.|
14+
| [MATLAB_RELEASE](#build-an-image-for-a-different-release-of-matlab) | R2024b | The MATLAB release you are using. Used to install its software dependencies.|
1515
| [PYTHON_VERSION](#choose-version-of-python) | 3.10 | Select version of Python used by Jupyter. See [here](https://hub.docker.com/r/jupyter/base-notebook/tags?page=1&name=python-), for list of Python tags available for use. |
16-
| **MATLAB_IMAGE_NAME** | mathworks/matlab:r2024a | Specify the name of the Docker image that MATLAB should be extracted from. |
16+
| **MATLAB_IMAGE_NAME** | mathworks/matlab:R2024b | Specify the name of the Docker image that MATLAB should be extracted from. |
1717
| [LICENSE_SERVER](#build-an-image-with-license-server-information) | *unset* | The port and hostname of the machine that is running the Network License Manager, using the `port@hostname` syntax. For Example: `27000@MyServerName`. </br> Click [Using the Network License Manager](https://github.com/mathworks-ref-arch/matlab-dockerfile#use-the-network-license-manager) to learn more.|
1818

19-
Listed below is an example of the command to build a Docker image that extracts MATLAB from the image `mathworks/matlab:r2024a` on DockerHub and installs it into `jupyter/base-notebook:python-3.10` with a License Server.
19+
Listed below is an example of the command to build a Docker image that extracts MATLAB from the image `mathworks/matlab:R2024b` on DockerHub and installs it into `jupyter/base-notebook:python-3.10` with a License Server.
2020
```bash
21-
docker build --build-arg MATLAB_RELEASE=r2024a \
21+
docker build --build-arg MATLAB_RELEASE=R2024b \
2222
--build-arg PYTHON_VERSION=3.10 \
23-
--build-arg MATLAB_IMAGE_NAME=mathworks/matlab:r2024a \
23+
--build-arg MATLAB_IMAGE_NAME=mathworks/matlab:R2024b \
2424
--build-arg LICENSE_SERVER=12345@hostname.com \
2525
-t matlab-notebook -f Dockerfile.byoi .
2626
```

matlab/README-mounted.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,21 @@ Look in the directory `matlab/ubuntu20.04` for Dockerfiles that are based on `ub
1010

1111
Build a Docker image called `matlab-notebook-nomatlab`, using the file `Dockerfile.mounted`.
1212

13-
Listed below is an example of the command to build a Docker image that extracts MATLAB from the image `mathworks/matlab:r2024a` on DockerHub and installs it into `jupyter/base-notebook:python-3.10` with a License Server.
13+
Listed below is an example of the command to build a Docker image that extracts MATLAB from the image `mathworks/matlab:R2024b` on DockerHub and installs it into `jupyter/base-notebook:python-3.10` with a License Server.
1414
```bash
15-
docker build --build-arg MATLAB_RELEASE=r2024a \
15+
docker build --build-arg MATLAB_RELEASE=R2024b \
1616
--build-arg PYTHON_VERSION=3.10 \
17-
--build-arg MATLAB_IMAGE_NAME=mathworks/matlab:r2024a \
17+
--build-arg MATLAB_IMAGE_NAME=mathworks/matlab:R2024b \
1818
--build-arg LICENSE_SERVER=12345@hostname.com \
1919
-t matlab-notebook-nomatlab -f Dockerfile.mounted .
2020
```
2121

2222
### Start the Docker Container
2323

24-
Execute the command below to start a Docker container, bind mount the directory `/usr/local/MATLAB/R2024a` (which must contain a MATLAB R2024a or later 64 bit Linux installation) into the directory `/opt/matlab` inside the container, and bind port 8888 on the host to port 8888 of the container (by default, Jupyter's app-server runs on port 8888 inside the container):
24+
Execute the command below to start a Docker container, bind mount the directory `/usr/local/MATLAB/R2024b` (which must contain a MATLAB R2024b or later 64 bit Linux installation) into the directory `/opt/matlab` inside the container, and bind port 8888 on the host to port 8888 of the container (by default, Jupyter's app-server runs on port 8888 inside the container):
2525

2626
```bash
27-
docker run -it -v /usr/local/MATLAB/R2024a:/opt/matlab:ro -p 8888:8888 matlab-notebook-nomatlab
27+
docker run -it -v /usr/local/MATLAB/R2024b:/opt/matlab:ro -p 8888:8888 matlab-notebook-nomatlab
2828
```
2929

3030
Access the Jupyter Notebook by following one of the URLs displayed in the output of the ```docker run``` command.

matlab/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ The [Dockerfile](https://github.com/mathworks-ref-arch/matlab-integration-for-ju
4444

4545
| Argument Name | Default value | Effect |
4646
|---|---|---|
47-
| [MATLAB_RELEASE](#build-an-image-for-a-different-release-of-matlab) | r2024a | The MATLAB release you want to install. **MUST** be newer than `r2020b` and specified in lower-case|
47+
| [MATLAB_RELEASE](#build-an-image-for-a-different-release-of-matlab) | R2024b | The MATLAB release you want to install. **MUST** be newer than `r2020b` and specified in lower-case|
4848
| [MATLAB_PRODUCT_LIST](#customize-products-to-install) | MATLAB | Specify the list of products to install using product names separated by spaces. Replace spaces within names with underscores. For example: `MATLAB Simulink Deep_Learning_Toolbox Parallel_Computing_Toolbox` </br> See [MPM Documentation](https://github.com/mathworks-ref-arch/matlab-dockerfile/blob/main/MPM.md) for more information.|
4949
| [PYTHON_VERSION](#choose-version-of-python) | 3.10 | Select version of Python used by Jupyter. See [here](https://hub.docker.com/r/jupyter/base-notebook/tags?page=1&name=python-), for list of Python tags available for use. |
5050
| [LICENSE_SERVER](#build-an-image-with-license-server-information) | *unset* | The port and hostname of the machine that is running the Network License Manager, using the `port@hostname` syntax. For Example: `27000@MyServerName`. </br> Click [Using the Network License Manager](https://github.com/mathworks-ref-arch/matlab-dockerfile#use-the-network-license-manager) to learn more.|
@@ -60,8 +60,8 @@ docker build --build-arg MATLAB_PRODUCT_LIST="MATLAB Symbolic_Math_Toolbox" -t m
6060

6161
### Build an Image for a Different Release of MATLAB
6262
```bash
63-
# Builds an image with MATLAB R2024a
64-
docker build --build-arg MATLAB_RELEASE=r2024a -t matlab-notebook .
63+
# Builds an image with MATLAB R2024b
64+
docker build --build-arg MATLAB_RELEASE=R2024b -t matlab-notebook .
6565
```
6666

6767
### Build an Image with a different version of Python.

0 commit comments

Comments
 (0)