Skip to content

Commit 31b2d96

Browse files
michaelmcdonnellmwPrabhakar Kumar
authored andcommitted
Updates to repository for MATLAB R2024a.
1 parent a26fd31 commit 31b2d96

File tree

12 files changed

+57
-57
lines changed

12 files changed

+57
-57
lines changed

.github/workflows/build-test-publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2022-2023 The MathWorks, Inc.
1+
# Copyright 2022-2024 The MathWorks, Inc.
22

33
name: Build, Test and Publish the Dockerfile
44

@@ -26,7 +26,7 @@ jobs:
2626
strategy:
2727
fail-fast: false
2828
matrix:
29-
matlab-release: [r2023b, r2023a, r2022b, r2022a, r2021b, r2021a, r2020b]
29+
matlab-release: [r2024a, r2023b, r2023a, r2022b, r2022a, r2021b, r2021a, r2020b]
3030

3131
steps:
3232
- name: Checkout repo

.github/workflows/from-matlab-docker-build-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2023 The MathWorks, Inc.
1+
# Copyright 2023-2024 The MathWorks, Inc.
22

33
name: Build and Test the "Building on MATLAB Docker Image" Dockerfile
44

@@ -27,7 +27,7 @@ jobs:
2727
strategy:
2828
fail-fast: false
2929
matrix:
30-
matlab-release: [r2023b, r2023a, r2022b, r2022a]
30+
matlab-release: [r2024a, r2023b, r2023a, r2022b, r2022a]
3131

3232
steps:
3333
- name: Checkout repo

.github/workflows/matlab-installer-build-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2023 The MathWorks, Inc.
1+
# Copyright 2023-2024 The MathWorks, Inc.
22

33
name: Build and Test the "MATLAB installer" Dockerfile
44

@@ -29,7 +29,7 @@ jobs:
2929
strategy:
3030
fail-fast: false
3131
matrix:
32-
matlab-release: [r2023b, r2023a, r2022b, r2022a, r2021b, r2021a, r2020b]
32+
matlab-release: [r2024a, r2023b, r2023a, r2022b, r2022a, r2021b, r2021a, r2020b]
3333

3434
steps:
3535
- name: Checkout repo

Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
# Copyright 2019 - 2023 The MathWorks, Inc.
1+
# Copyright 2019 - 2024 The MathWorks, Inc.
22
# This Dockerfile allows you to build a Docker® image with MATLAB® installed using the MATLAB Package
33
# Manager. Use the optional build arguments to customize the version of MATLAB, list of products to
44
# install, and the location at which to install MATLAB.
55

66
# Here is an example docker build command with the optional build arguments.
7-
# docker build --build-arg MATLAB_RELEASE=r2023b
7+
# docker build --build-arg MATLAB_RELEASE=r2024a
88
# --build-arg MATLAB_PRODUCT_LIST="MATLAB Deep_Learning_Toolbox Symbolic_Math_Toolbox"
9-
# --build-arg MATLAB_INSTALL_LOCATION="/opt/matlab/R2023b"
9+
# --build-arg MATLAB_INSTALL_LOCATION="/opt/matlab/R2024a"
1010
# --build-arg [email protected]
1111
# -t my_matlab_image_name .
1212

1313
# To specify which MATLAB release to install in the container, edit the value of the MATLAB_RELEASE argument.
1414
# Use lowercase to specify the release, for example: ARG MATLAB_RELEASE=r2021b
15-
ARG MATLAB_RELEASE=r2023b
15+
ARG MATLAB_RELEASE=r2024a
1616

1717
# Specify the list of products to install into MATLAB.
1818
ARG MATLAB_PRODUCT_LIST="MATLAB"
@@ -63,7 +63,7 @@ RUN wget -q https://www.mathworks.com/mpm/glnxa64/mpm \
6363
--destination=${MATLAB_INSTALL_LOCATION} \
6464
--products ${MATLAB_PRODUCT_LIST} \
6565
|| (echo "MPM Installation Failure. See below for more information:" && cat /tmp/mathworks_root.log && false) \
66-
&& sudo rm -f mpm /tmp/mathworks_root.log \
66+
&& sudo rm -rf mpm /tmp/mathworks_root.log ${HOME}/.MathWorks \
6767
&& sudo ln -s ${MATLAB_INSTALL_LOCATION}/bin/matlab /usr/local/bin/matlab
6868

6969
# Note: Uncomment one of the following two ways to configure the license server.

README.md

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ cd matlab-dockerfile
2727

2828
Build container with a name and tag of your choice.
2929
```bash
30-
docker build -t matlab:r2023b .
30+
docker build -t matlab:r2024a .
3131
```
3232

3333
Run the container. Test the container by running an example MATLAB command such as ver.
3434
```bash
35-
docker run --init --rm -e MLM_LICENSE_FILE=27000@MyServerName matlab:r2023b -batch ver
35+
docker run --init --rm -e MLM_LICENSE_FILE=27000@MyServerName matlab:r2024a -batch ver
3636
```
37-
The [Dockerfile](https://github.com/mathworks-ref-arch/matlab-dockerfile/blob/main/Dockerfile) defaults to building a container for MATLAB R2023b.
37+
The [Dockerfile](https://github.com/mathworks-ref-arch/matlab-dockerfile/blob/main/Dockerfile) defaults to building a container for MATLAB R2024a.
3838

3939
The example command `ver` displays the version number of MATLAB and other installed products. For more information, see [ver](https://www.mathworks.com/help/matlab/ref/ver.html). For more information on running the container, see the section on [Running the Container](#run-the-container).
4040

@@ -57,9 +57,9 @@ The [Dockerfile](https://github.com/mathworks-ref-arch/matlab-dockerfile/blob/ma
5757

5858
| Argument Name | Default value | Description |
5959
|---|---|---|
60-
| [MATLAB_RELEASE](#build-an-image-for-a-different-release-of-matlab) | r2023b | The MATLAB release you want to install, in lower-case. For example: `r2019b`|
60+
| [MATLAB_RELEASE](#build-an-image-for-a-different-release-of-matlab) | r2024a | The MATLAB release you want to install, in lower-case. For example: `r2019b`|
6161
| [MATLAB_PRODUCT_LIST](#build-an-image-with-a-specific-set-of-products) | MATLAB | Products to install as a space-separated list. For more information, see [MPM.md](https://github.com/mathworks-ref-arch/matlab-dockerfile/blob/main/MPM.md). For example: `MATLAB Simulink Deep_Learning_Toolbox Fixed-Point_Designer`|
62-
| [MATLAB_INSTALL_LOCATION](#build-an-image-with-matlab-installed-to-a-specific-location) | /opt/matlab/r2023b | The path to install MATLAB. |
62+
| [MATLAB_INSTALL_LOCATION](#build-an-image-with-matlab-installed-to-a-specific-location) | /opt/matlab/r2024a | The path to install MATLAB. |
6363
| [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` |
6464

6565
Use these arguments with the the `docker build` command to customize your image.
@@ -74,24 +74,24 @@ docker build --build-arg MATLAB_RELEASE=r2019b -t matlab:r2019b .
7474
#### Build an Image with a specific set of products
7575
For example, to build an image with MATLAB and Simulink®, use this command.
7676
```bash
77-
docker build --build-arg MATLAB_PRODUCT_LIST='MATLAB Simulink' -t matlab:r2023b .
77+
docker build --build-arg MATLAB_PRODUCT_LIST='MATLAB Simulink' -t matlab:r2024a .
7878
```
7979

8080
#### Build an Image with MATLAB installed to a specific location
8181
For example, to build an image with MATLAB installed at /opt/matlab, use this command.
8282
```bash
83-
docker build --build-arg MATLAB_INSTALL_LOCATION='/opt/matlab' -t matlab:r2023b .
83+
docker build --build-arg MATLAB_INSTALL_LOCATION='/opt/matlab' -t matlab:r2024a .
8484
```
8585

8686
#### Build an Image with License Server Information
8787

8888
Including the license server information with the `docker build` command means you do not have to pass it when running the container.
8989
```bash
9090
# Build container with the License Server.
91-
docker build --build-arg LICENSE_SERVER=27000@MyServerName -t matlab:r2023b .
91+
docker build --build-arg LICENSE_SERVER=27000@MyServerName -t matlab:r2024a .
9292

9393
# Run the container, without needing to pass license information.
94-
docker run --init --rm matlab:r2023b -batch ver
94+
docker run --init --rm matlab:r2024a -batch ver
9595
```
9696

9797
## Use the Network License Manager
@@ -124,7 +124,7 @@ With the `docker build` command, either:
124124

125125
```bash
126126
# Example
127-
docker build -t matlab:r2023b --build-arg LICENSE_SERVER=27000@MyServerName .
127+
docker build -t matlab:r2024a --build-arg LICENSE_SERVER=27000@MyServerName .
128128
```
129129
- Use the `network.lic` file:
130130
1. Place the `network.lic` file in the same folder as the Dockerfile.
@@ -133,41 +133,41 @@ With the `docker build` command, either:
133133

134134
```bash
135135
# Example
136-
docker build -t matlab:r2023b .
136+
docker build -t matlab:r2024a .
137137
```
138138

139139
With the `docker run` command, use the `MLM_LICENSE_FILE` environment variable. For example:
140140

141141
```bash
142-
docker run --init --rm -e MLM_LICENSE_FILE=27000@MyServerName matlab:r2023b -batch ver
142+
docker run --init --rm -e MLM_LICENSE_FILE=27000@MyServerName matlab:r2024a -batch ver
143143
```
144144

145145
## Run the Container
146146
If you did not provide the license server information when building the image, then provide it when running the container. Set the environment variable `MLM_LICENSE_FILE` using the `-e` flag, with the network license manager's location in the format `port@hostname`.
147147
148148
```bash
149149
# Start MATLAB, print version information, and exit:
150-
docker run --init --rm -e MLM_LICENSE_FILE=27000@MyServerName matlab:r2023b -batch ver
150+
docker run --init --rm -e MLM_LICENSE_FILE=27000@MyServerName matlab:r2024a -batch ver
151151
```
152152
153153
You can run the container **without** specifying `MLM_LICENSE_FILE` if you provided the license server information when building the image, as shown in the examples below.
154154
155155
### Run MATLAB in an Interactive Command Prompt
156156
To start the container and run MATLAB in an interactive command prompt, execute:
157157
```bash
158-
docker run --init -it --rm matlab:r2023b
158+
docker run --init -it --rm matlab:r2024a
159159
```
160160
### Run MATLAB in Batch Mode
161161
To start the container, run a MATLAB command, and then exit, execute:
162162
```bash
163163
# Container runs the command RAND in MATLAB and exits.
164-
docker run --init --rm matlab:r2023b -batch rand
164+
docker run --init --rm matlab:r2024a -batch rand
165165
```
166166
167167
### Run MATLAB with Startup Options
168168
To override the default behavior of the container and run MATLAB with any set of arguments, such as `-logfile`, execute:
169169
```bash
170-
docker run --init -it --rm matlab:r2023b -logfile "logfilename.log"
170+
docker run --init -it --rm matlab:r2024a -logfile "logfilename.log"
171171
```
172172
To learn more, see the documentation: [Commonly Used Startup Options](https://www.mathworks.com/help/matlab/matlab_env/commonly-used-startup-options.html).
173173
@@ -192,7 +192,7 @@ For some workflows and toolboxes, you must specify dependencies. You must do thi
192192
* Use the MATLAB Engine API for C and Fortran®.
193193
* Use the Polyspace® 32-bit tcc compiler.
194194
195-
The [matlab-deps repository](https://github.com/mathworks-ref-arch/container-images/tree/main/matlab-deps) repository lists Dockerfiles for various releases and platforms. To view the Dockerfile for R2023b, click [here](https://github.com/mathworks-ref-arch/container-images/blob/main/matlab-deps/r2023b/ubuntu22.04/Dockerfile).
195+
The [matlab-deps repository](https://github.com/mathworks-ref-arch/container-images/tree/main/matlab-deps) repository lists Dockerfiles for various releases and platforms. To view the Dockerfile for R2024a, click [here](https://github.com/mathworks-ref-arch/container-images/blob/main/matlab-deps/r2024a/ubuntu22.04/Dockerfile).
196196
197197
These Dockerfiles contain commented lines with the libraries that support these additional capabilities. Copy and uncomment these lines into your Dockerfile.
198198

alternates/building-on-matlab-docker-image/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# Copyright 2023 The MathWorks, Inc.
1+
# Copyright 2023-2024 The MathWorks, Inc.
22

33
# To specify which MATLAB release to install in the container, edit the value of the MATLAB_RELEASE argument.
44
# Use lower case to specify the release, for example: ARG MATLAB_RELEASE=r2021b
5-
ARG MATLAB_RELEASE=r2023b
5+
ARG MATLAB_RELEASE=r2024a
66

77
# Specify the extra products to install into the image. These products can either be toolboxes or support packages.
88
ARG ADDITIONAL_PRODUCTS="Symbolic_Math_Toolbox Deep_Learning_Toolbox_Model_for_ResNet-50_Network"
@@ -47,7 +47,7 @@ RUN wget -q https://www.mathworks.com/mpm/glnxa64/mpm \
4747
--release=${MATLAB_RELEASE} \
4848
--products ${ADDITIONAL_PRODUCTS} \
4949
|| (echo "MPM Installation Failure. See below for more information:" && cat /tmp/mathworks_root.log && false) \
50-
&& sudo rm -f mpm /tmp/mathworks_root.log
50+
&& sudo rm -rf mpm /tmp/mathworks_root.log ${HOME}/.MathWorks
5151

5252
# When running the container a license file can be mounted,
5353
# or a license server can be provided as an environment variable.

alternates/building-on-matlab-docker-image/README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@ cd matlab-dockerfile/alternates/building-on-matlab-docker-image
2525
### Quick start
2626
Build a container with a name and tag.
2727
```bash
28-
docker build -t matlab_with_add_ons:r2023b .
28+
docker build -t matlab_with_add_ons:r2024a .
2929
```
3030

3131
You can then run the container with the "batch" option. Test the container by running an example MATLAB command such as `ver` to display the installed toolboxes.
3232
```bash
33-
docker run --init --rm -e MLM_LICENSE_FILE=27000@MyServerName matlab_with_add_ons:r2023b -batch ver
33+
docker run --init --rm -e MLM_LICENSE_FILE=27000@MyServerName matlab_with_add_ons:r2024a -batch ver
3434
```
3535
You can check the installed support packages using the MATLAB command `matlabshared.supportpkg.getInstalled`.
3636

3737
You can also run the container with the "browser" option to access MATLAB in a browser.
3838
```bash
39-
docker run --init --rm -it -p 8888:8888 matlab_with_add_ons:r2023b -browser
39+
docker run --init --rm -it -p 8888:8888 matlab_with_add_ons:r2024a -browser
4040
```
4141
For more information, see [Run the Container](#run-the-container).
4242

@@ -51,7 +51,7 @@ The `ADDITIONAL_PRODUCTS` argument must be a space separated list surrounded by
5151
By default, `ADDITIONAL_PRODUCTS` includes example products, which you can replace.
5252
For example, to build an image containing MATLAB and the Deep Learning Toolbox™:
5353
```bash
54-
docker build --build-arg ADDITIONAL_PRODUCTS="Deep_Learning_Toolbox" -t matlab_with_add_ons:r2023b .
54+
docker build --build-arg ADDITIONAL_PRODUCTS="Deep_Learning_Toolbox" -t matlab_with_add_ons:r2024a .
5555
```
5656

5757
For a successful build, include at least one product.
@@ -67,7 +67,7 @@ The [Dockerfile](https://github.com/mathworks-ref-arch/matlab-dockerfile/blob/ma
6767

6868
| Argument Name | Default value | Effect |
6969
|---|---|---|
70-
| [MATLAB_RELEASE](#build-an-image-for-a-different-release-of-matlab) | r2023b | The MATLAB release to install. Must be lower-case, for example: `r2020b`.|
70+
| [MATLAB_RELEASE](#build-an-image-for-a-different-release-of-matlab) | r2024a | The MATLAB release to install. Must be lower-case, for example: `r2020b`.|
7171
| [ADDITIONAL_PRODUCTS](#customize-products-to-install-using-matlab-package-manager-mpm) | "Symbolic_Math_Toolbox Deep_Learning_Toolbox_Model_for_ResNet-50_Network" | A space separated list of toolboxes and support packages to install. For more details, see [MATLAB Package Manager](https://github.com/mathworks-ref-arch/matlab-dockerfile/blob/main/MPM.md)|
7272
| [LICENSE_SERVER](#build-an-image-with-license-server-information) | *unset* | The port and hostname of a machine that is running a Network License Manager, using the `port@hostname` syntax. For example: `27000@MyServerName`. To use this build argument, the corresponding lines must be uncommented in the Dockerfile. |
7373

@@ -95,12 +95,12 @@ server or browser mode will not start successfully.
9595

9696
Build container with the License Server.
9797
```bash
98-
docker build -t matlab_with_add_ons:r2023b --build-arg LICENSE_SERVER=27000@MyServerName .
98+
docker build -t matlab_with_add_ons:r2024a --build-arg LICENSE_SERVER=27000@MyServerName .
9999
```
100100

101101
Run the container, without needing to pass license information.
102102
```bash
103-
docker run --init matlab_with_add_ons:r2023b -batch ver
103+
docker run --init matlab_with_add_ons:r2024a -batch ver
104104
```
105105
## Run the Container
106106
The Docker container you build using this Dockerfile inherits run options from its base image.

alternates/matlab-installer/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# Copyright 2023 The MathWorks, Inc.
1+
# Copyright 2023-2024 The MathWorks, Inc.
22

33
# To specify which MATLAB release you wish to install in the container, edit the value of the MATLAB_RELEASE argument.
44
# Use lower case to specify the release.
5-
ARG MATLAB_RELEASE=r2023b
5+
ARG MATLAB_RELEASE=r2024a
66

77
FROM ubuntu as versioner
88

alternates/matlab-installer/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ The [Dockerfile](https://github.com/mathworks-ref-arch/matlab-dockerfile/blob/ma
7474

7575
| Argument Name | Default value | Effect |
7676
| ------------------------------------------------------------------- | ------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- |
77-
| [MATLAB_RELEASE](#build-an-image-for-a-different-release-of-matlab) | latest | The MATLAB release you want to install. Must be lower-case, for example: `r2023b`. |
77+
| [MATLAB_RELEASE](#build-an-image-for-a-different-release-of-matlab) | latest | The MATLAB release you want to install. Must be lower-case, for example: `r2024a`. |
7878
| [LICENSE_SERVER](#build-an-image-with-license-server-information) | _unset_ | The port and hostname of the machine running the Network License Manager, using the `port@hostname` syntax. For example: `27000@MyServerName` |
7979

8080
Use these arguments with the `docker build` command to customize your image. Run a command from the `alternates/matlab-installer` of the cloned repository of the form:

alternates/non-interactive/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
# version of MATLAB, list of products to install, and the location at which to install MATLAB.
55

66
# Here is an example docker build command with the optional build arguments.
7-
# docker build --build-arg MATLAB_RELEASE=r2023b
7+
# docker build --build-arg MATLAB_RELEASE=r2024a
88
# --build-arg MATLAB_PRODUCT_LIST="MATLAB Deep_Learning_Toolbox Symbolic_Math_Toolbox"
9-
# --build-arg MATLAB_INSTALL_LOCATION="/opt/matlab/R2023b"
9+
# --build-arg MATLAB_INSTALL_LOCATION="/opt/matlab/R2024a"
1010
# -t my_matlab_image_name .
1111

1212
# To specify which MATLAB release to install in the container, edit the value of the MATLAB_RELEASE argument.
1313
# Use lowercase to specify the release, for example: ARG MATLAB_RELEASE=r2021b
14-
ARG MATLAB_RELEASE=r2023b
14+
ARG MATLAB_RELEASE=r2024a
1515

1616
# Specify the list of products to install into MATLAB.
1717
ARG MATLAB_PRODUCT_LIST="MATLAB"
@@ -58,7 +58,7 @@ RUN wget -q https://www.mathworks.com/mpm/glnxa64/mpm \
5858
--destination=${MATLAB_INSTALL_LOCATION} \
5959
--products ${MATLAB_PRODUCT_LIST} \
6060
|| (echo "MPM Installation Failure. See below for more information:" && cat /tmp/mathworks_root.log && false) \
61-
&& sudo rm -f mpm /tmp/mathworks_root.log \
61+
&& sudo rm -rf mpm /tmp/mathworks_root.log ${HOME}/.MathWorks \
6262
&& sudo ln -s ${MATLAB_INSTALL_LOCATION}/bin/matlab /usr/local/bin/matlab
6363

6464
# Install matlab-batch to enable the use of MATLAB batch licensing tokens.

0 commit comments

Comments
 (0)