R2022b release!

LICENSE.md

@@ -1,17 +1,17 @@
-MATHWORKS CLOUD REFERENCE ARCHITECTURE LICENSE
-
-The files in this GitHub repository refer to commercial software products and services, virtual machine images, and related materials of The MathWorks, Inc. (“MathWorks Programs”). MathWorks Programs are separately licensed under the MathWorks Software License Agreement, available in the desktop installation of the MathWorks Programs or in the virtual machine image. The files in this GitHub repository may also refer to third-party software licensed under separate terms provided by such third parties.
-
-The following license terms apply only to the files in this GitHub repository, including files in this folder and its subfolders, and do not apply to MathWorks Programs. References to “software” and “code” in the following license terms refer to the files in this GitHub repository.
-
-Copyright (c) 2020, The MathWorks, Inc.
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-3. In all cases, the software is, and all modifications and derivatives of the software shall be, licensed to you solely for use in conjunction with MathWorks products and service offerings.
-
+MATHWORKS CLOUD REFERENCE ARCHITECTURE LICENSE
+
+The files in this GitHub repository refer to commercial software products and services, virtual machine images, and related materials of The MathWorks, Inc. (“MathWorks Programs”). MathWorks Programs are separately licensed under the MathWorks Software License Agreement, available in the desktop installation of the MathWorks Programs or in the virtual machine image. The files in this GitHub repository may also refer to third-party software licensed under separate terms provided by such third parties.
+
+The following license terms apply only to the files in this GitHub repository, including files in this folder and its subfolders, and do not apply to MathWorks Programs. References to “software” and “code” in the following license terms refer to the files in this GitHub repository.
+
+Copyright (c) 2020, The MathWorks, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+3. In all cases, the software is, and all modifications and derivatives of the software shall be, licensed to you solely for use in conjunction with MathWorks products and service offerings.
+
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

@@ -1,43 +1,46 @@
-# MATLAB on Microsoft Azure (Windows VM)
+# MATLAB on Microsoft Azure
 
 # Requirements
 Before starting, you will need the following:
 
-- A MATLAB® license. For more information, see [Confirm Licensing for MathWorks Products Running on the Cloud](https://mathworks.com/help/install/license/licensing-for-mathworks-products-running-on-the-cloud.html).
-- A [MathWorks Account](https://www.mathworks.com/login?uri=%2Fmwaccount%2F).
-- A Microsoft Azure account.
+- A MATLAB® license. For more information, see [Confirm Licensing for MathWorks Products Running on the Cloud](https://mathworks.com/help/install/license/licensing-for-mathworks-products-running-on-the-cloud.html).
+- A [MathWorks® Account](https://www.mathworks.com/login?uri=%2Fmwaccount%2F).
+- An Azure® account.
 
 # Costs
 
 You are responsible for the cost of the Azure services used when you create cloud resources using this guide. Resource settings, such as instance type, will affect the cost of deployment. For cost estimates, see the pricing pages for each Azure service you will be using. Prices are subject to change.
 
 # Introduction
 
-The following guide will help you automate the process of running the MATLAB desktop on Microsoft Azure using a Windows virtual machine and connect to it using the Remote Desktop Protocol (RDP) or SSH. The automation is accomplished using an Azure Resource Manager (ARM) template. The template is a JSON file that defines the resources needed to run MATLAB on Azure. For information about the architecture of this solution, see [Architecture and Resources](#architecture-and-resources).
+The following guide will help you automate the process of running the MATLAB desktop on Microsoft Azure using a virtual machine, and connect to it using the Remote Desktop Protocol (RDP) or SSH. The automation is accomplished using an Azure Resource Manager (ARM) template. The template is a JSON file that defines the resources needed to run MATLAB on Azure. For information about the architecture of this solution, see [Architecture and Resources](#architecture-and-resources).
 
 # Deployment Steps
 
-The MATLAB Reference Architecture is released with the twice-yearly general release schedule of MATLAB. To view instructions for deploying the MATLAB reference architecture, select a MATLAB release:
+To view instructions for deploying the MATLAB reference architecture, select a MATLAB release:
 
-| Release |
-| ------- |
-| [R2022a](releases/R2022a/README.md) |
-| [R2021b](releases/R2021b/README.md) |
-| [R2021a](releases/R2021a/README.md) |
-| [R2020b](releases/R2020b/README.md) |
+| Linux | Windows |
+| ----- | ------- |
+| [R2022b](https://github.com/mathworks-ref-arch/matlab-on-azure/tree/master/releases/R2022b/README.md) | [R2022b](releases/R2022b/README.md) |
+| [R2022a](https://github.com/mathworks-ref-arch/matlab-on-azure/tree/master/releases/R2022a/README.md) | [R2022a](releases/R2022a/README.md) |
+| [R2021b](https://github.com/mathworks-ref-arch/matlab-on-azure/tree/master/releases/R2021b/README.md) | [R2021b](releases/R2021b/README.md) |
+| [R2021a](https://github.com/mathworks-ref-arch/matlab-on-azure/tree/master/releases/R2021a/README.md) | [R2021a](releases/R2021a/README.md) |
+| [R2020b](https://github.com/mathworks-ref-arch/matlab-on-azure/tree/master/releases/R2020b/README.md) | [R2020b](releases/R2020b/README.md) |
+| [R2020a](https://github.com/mathworks-ref-arch/matlab-on-azure/tree/master/releases/R2020a/README.md) |  |
+| [R2019b](https://github.com/mathworks-ref-arch/matlab-on-azure/tree/master/releases/R2019b/README.md) |  |
+| [R2019a\_and\_older](https://github.com/mathworks-ref-arch/matlab-on-azure/tree/master/releases/R2019a_and_older/README.md) |  |
 
 
 # Architecture and Resources
-Deploying this reference architecture will create several resources in your
-resource group.
+Deploying this reference architecture will create several resources in your resource group.
 
 ![MATLAB on Azure Reference Architecture](img/azure-matlab-diagram.png)
 
-Deploying this reference architecture sets up a single Azure virtual machine running Windows and MATLAB, a network interface with a public IP address to connect to the virtual machine, a network security group that controls network traffic, and a virtual network for communication between resources.
+Deploying this reference architecture sets up a single Azure virtual machine containing MATLAB, a network interface with a public IP address to connect to the virtual machine, a network security group that controls network traffic, and a virtual network for communication between resources.
 
-To make deployment easy, a preconfigured Windows Server 2019 virtual machine is provided. The VM image contains the following software:
-* MATLAB, Simulink, Toolboxes, and support for GPUs.<p>To see a list of installed products, type `ver` at the MATLAB command prompt.</p>
-* Add-Ons: Deep Learning Toolbox(TM) Model for AlexNet Network, Deep Learning Toolbox Model for GoogLeNet Network, and Deep Learning Toolbox Model for ResNet-50 Network
+To make deployment easy, a preconfigured virtual machine is provided. The VM image contains the following software:
+* MATLAB, Simulink, Toolboxes, and support for GPUs.
+* Add-ons: Several pretrained deep neural networks for classification, feature extraction, and transfer learning with Deep Learning Toolbox&trade;, including GoogLeNet, ResNet-50, and NASNet-Large.
 
 ### Resources
 
@@ -53,23 +56,25 @@ To make deployment easy, a preconfigured Windows Server 2019 virtual machine is
 
 ## FAQ
 
-
 ### How do I save my changes in the VM?
-All your files and changes are stored locally on the virtual machine.  They will persist until you either terminate the virtual machine instance or delete the resource group. Stopping the instance does not destroy the data on the instance.  If you want your changes to persist before you terminate an instance, you’ll need to:
+All your files and changes are stored locally on the virtual machine. They will persist until you either terminate the virtual machine instance or delete the resource group. Stopping the instance does not destroy the data on the instance. If you want your changes to persist before you terminate an instance, you’ll need to:
 * copy your files to another location, or
 * create an image of the virtual machine.
 
 ### What happens to my data if I shut down the instance?
-You may want to shut down the instance when you aren’t using it.  Any files or changes made to the virtual machine will persist when shutting down and will be there when you restart.
+You may want to shut down the instance when you aren’t using it. Any files or changes made to the virtual machine will persist when shutting down and will be there when you restart.
 
 ### How do I save an image?
-You can save a copy of your current virtual machine.  Locate the Azure VM in your resource group in the Azure Portal, click “Capture Image” and follow the instructions.
+You can save a copy of your current virtual machine. Locate the Azure VM in your resource group in the Azure Portal, click “Capture Image” and follow the instructions.
 
 ### How do I customize the image?
 You can customize an image by launching the reference architecture, applying any changes you want to the virtual machine such as installing additional software, drivers and files and then saving an image of that virtual machine using the Azure Portal. For more information, see [How do I save an image?](#how-do-i-save-an-image). When you launch the reference architecture, click “Edit Template”, replace the `baseImageUri` in the “variables” section with the URL from your custom image. Save and finish the deployment steps by filling out parameters, accepting the terms and clicking “Create”.
 
 ### How do I use a different license manager?
 The VM image uses MathWorks Hosted License Manager by default. For information on using other license managers, see [MATLAB Licensing in the Cloud](https://www.mathworks.com/help/licensingoncloud/matlab-on-the-cloud.html).
 
+### How do I deploy into an existing virtual network?
+You will need to edit the template and replace the appropriate sections with your own virtual network and subnet resource IDs.
+
 # Technical Support
 If you require assistance or have a request for additional features or capabilities, please contact [MathWorks Technical Support](https://www.mathworks.com/support/contact_us.html).

SECURITY.md

@@ -1,6 +1,6 @@
-Reporting Security Vulnerabilities
-==================================
-If you believe you have discovered a security vulnerability, please report it to
-security@mathworks.com instead of GitHub. Please see
-[MathWorks Vulnerability Disclosure Policy for Security Researchers](https://www.mathworks.com/company/aboutus/policies_statements/vulnerability-disclosure-policy.html)
+Reporting Security Vulnerabilities
+==================================
+If you believe you have discovered a security vulnerability, please report it to
+security@mathworks.com instead of GitHub. Please see
+[MathWorks Vulnerability Disclosure Policy for Security Researchers](https://www.mathworks.com/company/aboutus/policies_statements/vulnerability-disclosure-policy.html)
 for additional information.

function-apps/host.json

@@ -0,0 +1,10 @@
+{
+  "version": "2.0",
+  "managedDependency": {
+    "Enabled": true
+  },
+  "extensionBundle": {
+    "id": "Microsoft.Azure.Functions.ExtensionBundle",
+    "version": "[2.*, 3.0.0)"
+  }
+}

function-apps/mw-autoshutdown-app/function.json

@@ -0,0 +1,10 @@
+{
+  "bindings": [
+    {
+      "name": "Timer",
+      "schedule": "0 */15 * * * *",
+      "direction": "in",
+      "type": "timerTrigger"
+    }
+  ]
+}