Merge branch 'Azure:master' into patch-2

Author: mgreenegit

SOURCES

@@ -0,0 +1,14 @@
+Azure Cloud Shell uses packages from CBL-D:
+- https://packages.microsoft.com/repos/cbl-d/ 
+
+Source for packages in this directory are available at:
+- https://cbldsrc.blob.core.windows.net/quinault/index.html
+- https://cbldsrc.blob.core.windows.net/quinault-universe/index.html
+ 
+Alternately to obtain sources, you may send a check or money order for US $5.00, including the package name, version, and return address to:
+ 
+Source Code Compliance Team
+Microsoft Corporation
+One Microsoft Way
+Redmond, WA 98052
+USA

linux/base.Dockerfile

@@ -17,6 +17,8 @@ FROM sbidprod.azurecr.io/quinault
 
 SHELL ["/bin/bash","-c"] 
 
+# Added to fix CELA requirement to enable users to understand where the source of CBL-D packages come from
+COPY SOURCES .
 COPY linux/aptinstall.sh .
 COPY linux/installMaven.sh .
 
@@ -191,7 +193,7 @@ RUN chmod 755 /usr/local/bin/ansible* \
   && pip3 install virtualenv \
   && cd /opt \
   && virtualenv -p python3 ansible \
-  && /bin/bash -c "source ansible/bin/activate && pip3 install ansible && pip3 install pywinrm>=0.2.2 && deactivate" \
+  && /bin/bash -c "source ansible/bin/activate && pip3 install ansible && pip3 install pywinrm\>\=0\.2\.2 && deactivate" \
   && ansible-galaxy collection install azure.azcollection -p /usr/share/ansible/collections
 
 # Install latest version of Istio

linux/installMaven.sh

@@ -3,7 +3,7 @@
 # Customized Maven install from Apache mirrors according to best practices
 
 # Download maven from Apache Mirror
-MAVEN_VERSION=3.8.5
+MAVEN_VERSION=3.8.6
 wget https://dlcdn.apache.org/maven/maven-3/$MAVEN_VERSION/binaries/apache-maven-$MAVEN_VERSION-bin.tar.gz -P /opt
 tar xf /opt/apache-maven-$MAVEN_VERSION-bin.tar.gz -C /opt
 ln -s /opt/apache-maven-$MAVEN_VERSION /opt/maven