Skip to content

Commit 379a529

Browse files
michaelmcdonnellmwPrabhakar Kumar
authored and
Prabhakar Kumar
committed
Updates files to reference MATLAB R2024b.
1 parent b0c629d commit 379a529

17 files changed

+166
-125
lines changed

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,16 @@ jobs:
2828
strategy:
2929
fail-fast: false
3030
matrix:
31-
matlab-release: [R2024a, R2023b, R2023a, R2022b, R2022a, R2021b, R2021a, R2020b]
31+
matlab-release:
32+
- R2024b
33+
- R2024a
34+
- R2023b
35+
- R2023a
36+
- R2022b
37+
- R2022a
38+
- R2021b
39+
- R2021a
40+
- R2020b
3241

3342
steps:
3443
- name: Checkout repo
@@ -65,7 +74,7 @@ jobs:
6574
if [ -f tests/requirements.txt ]; then pip install -r tests/requirements.txt; fi
6675
6776
- name: Generate license file
68-
run: echo '${{ secrets.MATLAB_LICENSE_FILE_R2024A }}' > ${{ env.LICENSE_FILE_PATH }}
77+
run: echo '${{ secrets.MATLAB_LICENSE_FILE_R2024B }}' > ${{ env.LICENSE_FILE_PATH }}
6978

7079
- name: Test container
7180
env:

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,13 @@ jobs:
2929
strategy:
3030
fail-fast: false
3131
matrix:
32-
matlab-release: [R2024a, R2023b, R2023a, R2022b, R2022a]
32+
matlab-release:
33+
- R2024b
34+
- R2024a
35+
- R2023b
36+
- R2023a
37+
- R2022b
38+
- R2022a
3339

3440
steps:
3541
- name: Checkout repo
@@ -60,7 +66,7 @@ jobs:
6066
if [ -f tests/requirements.txt ]; then pip install -r tests/requirements.txt; fi
6167
6268
- name: Generate license file
63-
run: echo '${{ secrets.MATLAB_LICENSE_FILE_R2024A }}' > ${{ env.LICENSE_FILE_PATH }}
69+
run: echo '${{ secrets.MATLAB_LICENSE_FILE_R2024B }}' > ${{ env.LICENSE_FILE_PATH }}
6470

6571
- name: Test container
6672
working-directory: tests

.github/workflows/matlab-container-offline-install-build-test.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,23 @@ env:
2525
ALT_PATH: alternates/matlab-container-offline-install
2626
MATLAB_PRODUCT_LIST: "MATLAB Symbolic_Math_Toolbox Deep_Learning_Toolbox_Model_for_ResNet-50_Network"
2727
LICENSE_FILE_PATH: ${{ github.workspace }}/license.lic
28-
28+
2929
jobs:
3030
build-test-image:
3131
runs-on: ubuntu-latest
3232
strategy:
3333
fail-fast: false
3434
matrix:
35-
matlab-release: [R2024a, R2023b, R2023a, R2022b, R2022a, R2021b, R2021a, R2020b]
35+
matlab-release:
36+
- R2024b
37+
- R2024a
38+
- R2023b
39+
- R2023a
40+
- R2022b
41+
- R2022a
42+
- R2021b
43+
- R2021a
44+
- R2020b
3645

3746
steps:
3847
- name: Checkout repo
@@ -80,9 +89,8 @@ jobs:
8089
python -m pip install --upgrade pip
8190
if [ -f tests/requirements.txt ]; then pip install -r tests/requirements.txt; fi
8291
83-
8492
- name: Generate license file
85-
run: echo '${{ secrets.MATLAB_LICENSE_FILE_R2024A }}' > ${{ env.LICENSE_FILE_PATH }}
93+
run: echo '${{ secrets.MATLAB_LICENSE_FILE_R2024B }}' > ${{ env.LICENSE_FILE_PATH }}
8694

8795
- name: Test container
8896
working-directory: tests

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,16 @@ jobs:
3131
strategy:
3232
fail-fast: false
3333
matrix:
34-
matlab-release: [R2024a, R2023b, R2023a, R2022b, R2022a, R2021b, R2021a, R2020b]
34+
matlab-release:
35+
- R2024b
36+
- R2024a
37+
- R2023b
38+
- R2023a
39+
- R2022b
40+
- R2022a
41+
- R2021b
42+
- R2021a
43+
- R2020b
3544

3645
steps:
3746
- name: Checkout repo

.github/workflows/non-interactive-build-test.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,15 @@ jobs:
2929
fail-fast: false
3030
matrix:
3131
matlab-release:
32-
[R2024a, R2023b, R2023a, R2022b, R2022a, R2021b, R2021a, R2020b]
32+
- R2024b
33+
- R2024a
34+
- R2023b
35+
- R2023a
36+
- R2022b
37+
- R2022a
38+
- R2021b
39+
- R2021a
40+
- R2020b
3341

3442
steps:
3543
- name: Checkout repo

Dockerfile

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
# Copyright 2019-2024 The MathWorks, Inc.
2-
# This Dockerfile allows you to build a Docker® image with MATLAB® installed using the MATLAB Package
3-
# Manager. Use the optional build arguments to customize the version of MATLAB, list of products to
2+
# This Dockerfile allows you to build a Docker® image with MATLAB® installed using the MATLAB Package
3+
# 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=R2024a
7+
# docker build --build-arg MATLAB_RELEASE=R2024b
88
# --build-arg MATLAB_PRODUCT_LIST="MATLAB Deep_Learning_Toolbox Symbolic_Math_Toolbox"
9-
# --build-arg MATLAB_INSTALL_LOCATION="/opt/matlab/R2024a"
10-
# --build-arg [email protected]
9+
# --build-arg MATLAB_INSTALL_LOCATION="/opt/matlab/R2024b"
10+
# --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 uppercase to specify the release, for example: ARG MATLAB_RELEASE=R2021b
15-
ARG MATLAB_RELEASE=R2024a
15+
ARG MATLAB_RELEASE=R2024b
1616

1717
# Specify the list of products to install into MATLAB.
1818
ARG MATLAB_PRODUCT_LIST="MATLAB"
1919

2020
# Specify MATLAB Install Location.
2121
ARG MATLAB_INSTALL_LOCATION="/opt/matlab/${MATLAB_RELEASE}"
2222

23-
# Specify license server information using the format: port@hostname
23+
# Specify license server information using the format: port@hostname
2424
ARG LICENSE_SERVER
2525

2626
# When you start the build stage, this Dockerfile by default uses the Ubuntu-based matlab-deps image.
@@ -55,7 +55,7 @@ WORKDIR /home/matlab
5555
# Run mpm to install MATLAB in the target location and delete the mpm installation afterwards.
5656
# If mpm fails to install successfully, then print the logfile in the terminal, otherwise clean up.
5757
# Pass in $HOME variable to install support packages into the user's HOME folder.
58-
RUN wget -q https://www.mathworks.com/mpm/glnxa64/mpm \
58+
RUN wget -q https://www.mathworks.com/mpm/glnxa64/mpm \
5959
&& chmod +x mpm \
6060
&& sudo HOME=${HOME} ./mpm install \
6161
--release=${MATLAB_RELEASE} \
@@ -69,20 +69,20 @@ RUN wget -q https://www.mathworks.com/mpm/glnxa64/mpm \
6969

7070
# Option 1. Specify the host and port of the machine that serves the network licenses
7171
# if you want to store the license information in an environment variable. This
72-
# is the preferred option. You can either use a build variable, like this:
73-
# --build-arg LICENSE_SERVER=27000@MyServerName or you can specify the license server
72+
# is the preferred option. You can either use a build variable, like this:
73+
# --build-arg LICENSE_SERVER=27000@MyServerName or you can specify the license server
7474
# directly using: ENV MLM_LICENSE_FILE=27000@flexlm-server-name
7575
ENV MLM_LICENSE_FILE=$LICENSE_SERVER
7676

7777
# Option 2. Alternatively, you can put a license file into the container.
7878
# Enter the details of the license server in this file and uncomment the following line.
7979
# COPY network.lic ${MATLAB_INSTALL_LOCATION}/licenses/
8080

81-
# The following environment variables allow MathWorks to understand how this MathWorks
82-
# product (MATLAB Dockerfile) is being used. This information helps us make MATLAB even better.
83-
# Your content, and information about the content within your files, is not shared with MathWorks.
84-
# To opt out of this service, delete the environment variables defined in the following line.
85-
# To learn more, see the Help Make MATLAB Even Better section in the accompanying README:
81+
# The following environment variables allow MathWorks to understand how this MathWorks
82+
# product (MATLAB Dockerfile) is being used. This information helps us make MATLAB even better.
83+
# Your content, and information about the content within your files, is not shared with MathWorks.
84+
# To opt out of this service, delete the environment variables defined in the following line.
85+
# To learn more, see the Help Make MATLAB Even Better section in the accompanying README:
8686
# https://github.com/mathworks-ref-arch/matlab-dockerfile#help-make-matlab-even-better
8787
ENV MW_DDUX_FORCE_ENABLE=true MW_CONTEXT_TAGS=MATLAB:DOCKERFILE:V1
8888

README.md

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

3737
Build container with a name and tag of your choice.
3838
```bash
39-
docker build -t matlab:R2024a .
39+
docker build -t matlab:R2024b .
4040
```
4141

4242
Run the container. Test the container by running an example MATLAB command such as ver.
4343
```bash
44-
docker run --init --rm -e MLM_LICENSE_FILE=27000@MyServerName matlab:R2024a -batch ver
44+
docker run --init --rm -e MLM_LICENSE_FILE=27000@MyServerName matlab:R2024b -batch ver
4545
```
46-
The [Dockerfile](https://github.com/mathworks-ref-arch/matlab-dockerfile/blob/main/Dockerfile) defaults to building a container for MATLAB R2024a.
46+
The [Dockerfile](https://github.com/mathworks-ref-arch/matlab-dockerfile/blob/main/Dockerfile) defaults to building a container for MATLAB R2024b.
4747

4848
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).
4949

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

6767
| Argument Name | Default value | Description |
6868
|---|---|---|
69-
| [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`|
69+
| [MATLAB_RELEASE](#build-an-image-for-a-different-release-of-matlab) | R2024b | The MATLAB release you want to install, in lower-case. For example: `R2019b`|
7070
| [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`|
71-
| [MATLAB_INSTALL_LOCATION](#build-an-image-with-matlab-installed-to-a-specific-location) | /opt/matlab/R2024a | The path to install MATLAB. |
71+
| [MATLAB_INSTALL_LOCATION](#build-an-image-with-matlab-installed-to-a-specific-location) | /opt/matlab/R2024b | The path to install MATLAB. |
7272
| [LICENSE_SERVER](#build-an-image-configured-to-use-a-license-server) | *unset* | The port and hostname of the machine that is running the Network License Manager, using the `port@hostname` syntax. For example: `27000@MyServerName` |
7373

7474
Use these arguments with the the `docker build` command to customize your image.
@@ -83,24 +83,24 @@ docker build --build-arg MATLAB_RELEASE=R2019b -t matlab:R2019b .
8383
#### Build an Image with a specific set of products
8484
For example, to build an image with MATLAB and Simulink®, use this command.
8585
```bash
86-
docker build --build-arg MATLAB_PRODUCT_LIST='MATLAB Simulink' -t matlab:R2024a .
86+
docker build --build-arg MATLAB_PRODUCT_LIST='MATLAB Simulink' -t matlab:R2024b .
8787
```
8888

8989
#### Build an Image with MATLAB installed to a specific location
9090
For example, to build an image with MATLAB installed at /opt/matlab, use this command.
9191
```bash
92-
docker build --build-arg MATLAB_INSTALL_LOCATION='/opt/matlab' -t matlab:R2024a .
92+
docker build --build-arg MATLAB_INSTALL_LOCATION='/opt/matlab' -t matlab:R2024b .
9393
```
9494

9595
#### Build an Image Configured to Use a License Server
9696

9797
Including the license server information with the `docker build` command means you do not have to pass it when running the container.
9898
```bash
9999
# Build container with the License Server.
100-
docker build --build-arg LICENSE_SERVER=27000@MyServerName -t matlab:R2024a .
100+
docker build --build-arg LICENSE_SERVER=27000@MyServerName -t matlab:R2024b .
101101

102102
# Run the container, without needing to pass license information.
103-
docker run --init --rm matlab:R2024a -batch ver
103+
docker run --init --rm matlab:R2024b -batch ver
104104
```
105105

106106
## Use the Network License Manager
@@ -133,7 +133,7 @@ With the `docker build` command, either:
133133

134134
```bash
135135
# Example
136-
docker build -t matlab:R2024a --build-arg LICENSE_SERVER=27000@MyServerName .
136+
docker build -t matlab:R2024b --build-arg LICENSE_SERVER=27000@MyServerName .
137137
```
138138
- Use the `network.lic` file:
139139
1. Place the `network.lic` file in the same folder as the Dockerfile.
@@ -142,41 +142,41 @@ With the `docker build` command, either:
142142

143143
```bash
144144
# Example
145-
docker build -t matlab:R2024a .
145+
docker build -t matlab:R2024b .
146146
```
147147

148148
With the `docker run` command, use the `MLM_LICENSE_FILE` environment variable. For example:
149149

150150
```bash
151-
docker run --init --rm -e MLM_LICENSE_FILE=27000@MyServerName matlab:R2024a -batch ver
151+
docker run --init --rm -e MLM_LICENSE_FILE=27000@MyServerName matlab:R2024b -batch ver
152152
```
153153

154154
## Run the Container
155155
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`.
156156
157157
```bash
158158
# Start MATLAB, print version information, and exit:
159-
docker run --init --rm -e MLM_LICENSE_FILE=27000@MyServerName matlab:R2024a -batch ver
159+
docker run --init --rm -e MLM_LICENSE_FILE=27000@MyServerName matlab:R2024b -batch ver
160160
```
161161
162162
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.
163163
164164
### Run MATLAB in an Interactive Command Prompt
165165
To start the container and run MATLAB in an interactive command prompt, execute:
166166
```bash
167-
docker run --init -it --rm matlab:R2024a
167+
docker run --init -it --rm matlab:R2024b
168168
```
169169
### Run MATLAB in Batch Mode
170170
To start the container, run a MATLAB command, and then exit, execute:
171171
```bash
172172
# Container runs the command RAND in MATLAB and exits.
173-
docker run --init --rm matlab:R2024a -batch rand
173+
docker run --init --rm matlab:R2024b -batch rand
174174
```
175175
176176
### Run MATLAB with Startup Options
177177
To override the default behavior of the container and run MATLAB with any set of arguments, such as `-logfile`, execute:
178178
```bash
179-
docker run --init -it --rm matlab:R2024a -logfile "logfilename.log"
179+
docker run --init -it --rm matlab:R2024b -logfile "logfilename.log"
180180
```
181181
To learn more, see the documentation: [Commonly Used Startup Options](https://www.mathworks.com/help/matlab/matlab_env/commonly-used-startup-options.html).
182182
@@ -194,7 +194,7 @@ For some workflows and toolboxes, you must specify dependencies. You must do thi
194194
* Use the MATLAB Engine API for C and Fortran®.
195195
* Use the Polyspace® 32-bit tcc compiler.
196196
197-
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).
197+
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 R2024b, click [here](https://github.com/mathworks-ref-arch/container-images/blob/main/matlab-deps/r2024b/ubuntu22.04/Dockerfile).
198198
199199
These Dockerfiles contain commented lines with the libraries that support these additional capabilities. Copy and uncomment these lines into your Dockerfile.
200200

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# To specify which MATLAB release to install in the container, edit the value of the MATLAB_RELEASE argument.
44
# Use uppercase to specify the release, for example: ARG MATLAB_RELEASE=R2021b
5-
ARG MATLAB_RELEASE=R2024a
5+
ARG MATLAB_RELEASE=R2024b
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"
@@ -22,8 +22,8 @@ USER root
2222
RUN export DEBIAN_FRONTEND=noninteractive \
2323
&& apt-get update \
2424
&& apt-get install --no-install-recommends --yes \
25-
wget \
26-
ca-certificates \
25+
wget \
26+
ca-certificates \
2727
&& apt-get clean \
2828
&& apt-get autoremove \
2929
&& rm -rf /var/lib/apt/lists/*
@@ -54,7 +54,7 @@ RUN wget -q https://www.mathworks.com/mpm/glnxa64/mpm \
5454

5555
# Alternatively, you can provide a license server to use
5656
# with the docker image while building the image.
57-
# Specify the host and port of the machine that serves the network licenses
57+
# Specify the host and port of the machine that serves the network licenses
5858
# if you want to bind in the license info as an environment variable.
5959
# You can also build with something like --build-arg LICENSE_SERVER=27000@MyServerName,
6060
# in which case you should uncomment the following two lines.
@@ -63,11 +63,11 @@ RUN wget -q https://www.mathworks.com/mpm/glnxa64/mpm \
6363
# ARG LICENSE_SERVER
6464
# ENV MLM_LICENSE_FILE=$LICENSE_SERVER
6565

66-
# The following environment variables allow MathWorks to understand how this MathWorks
67-
# product is being used. This information helps us make MATLAB even better.
68-
# Your content, and information about the content within your files, is not shared with MathWorks.
66+
# The following environment variables allow MathWorks to understand how this MathWorks
67+
# product is being used. This information helps us make MATLAB even better.
68+
# Your content, and information about the content within your files, is not shared with MathWorks.
6969
# To opt out of this service, delete the environment variables defined in the following line.
70-
# See the Help Make MATLAB Even Better section in the accompanying README to learn more:
70+
# See the Help Make MATLAB Even Better section in the accompanying README to learn more:
7171
# https://github.com/mathworks-ref-arch/matlab-dockerfile#help-make-matlab-even-better
7272
ENV MW_DDUX_FORCE_ENABLE=true MW_CONTEXT_TAGS=$MW_CONTEXT_TAGS,MATLAB:TOOLBOXES:DOCKERFILE:V1
7373

0 commit comments

Comments
 (0)