base image update (#342)

* base image update

* update test

* Update tools.Dockerfile

---------

Co-authored-by: darrentu <[email protected]>
Co-authored-by: Darren Tu <[email protected]>

Author: hima-gadupudi

linux/powershell/PSCloudShellUtility/PSCloudShellUtility.psm1

@@ -1815,7 +1815,7 @@ function Get-PackageVersion() {
         @{displayname = "Helm"; command = "helm"; args = "version --short"; match = "v(.+)"},
         @{displayname = "AZCopy"; command = "azcopy"; args = "--version"; match = "azcopy version (.+)"},
         @{displayname = "Azure CLI"; command = "az"; args = "version "; match = "`"azure-cli`": `"(.+)`""},
-        @{displayname = "Kubectl"; command = "kubectl"; args = "version --client=true --short=true"; match = "Client Version: v(.+)"}
+        @{displayname = "Kubectl"; command = "kubectl"; args = "version --client=true | head -n 1"; match = "Client Version: v(.+)"}
         @{displayname = "Terraform"; command = "terraform"; args = "version"; match = "Terraform v(.+)"},
         @{displayname = "GitHub CLI"; command = "gh"; args = "--version"; match = "gh version (.+) \(.*"},
         @{displayname = "Azure Developer CLI"; command = "azd"; args = "version"; match = "azd version (\d+\.\d+\.\d+(-[\w\d\.]*)?).*"}

linux/tools.Dockerfile

@@ -4,7 +4,7 @@
 
 # To build yourself locally, override this location with a local image tag. See README.md for more detail
 
-ARG IMAGE_LOCATION=cdpxb787066ec88f4e20ae65e42a858c42ca00.azurecr.io/official/cloudshell:base.master.55fe0a50.20230503.1
+ARG IMAGE_LOCATION=cdpxb787066ec88f4e20ae65e42a858c42ca00.azurecr.io/official/cloudshell:base.master.3479fc9b.20230808.1
 
 # Copy from base build
 FROM ${IMAGE_LOCATION}
@@ -47,7 +47,8 @@ RUN curl -Lo bicep https://github.com/Azure/bicep/releases/latest/download/bicep
   && bicep --help
 
 # Temp: fix ansible modules. Proper fix is to update base layer to use regular python for Ansible.
-RUN wget -nv -q https://raw.githubusercontent.com/ansible-collections/azure/dev/requirements-azure.txt \
+RUN mkdir -p /usr/share/ansible/collections/ansible_collections/azure/azcollection/ \
+    && wget -nv -q -O /usr/share/ansible/collections/ansible_collections/azure/azcollection/requirements-azure.txt https://raw.githubusercontent.com/ansible-collections/azure/dev/requirements-azure.txt \
     && /opt/ansible/bin/python -m pip install -r /usr/share/ansible/collections/ansible_collections/azure/azcollection/requirements-azure.txt
 
 # Copy and run script to Install powershell modules and setup Powershell machine profile

tests/PSinLinuxCloudShellImage.Tests.ps1

@@ -18,7 +18,7 @@ Describe "Various programs installed with expected versions" {
 
     It "Static Versions" {
         # These programs are installed explicitly with specific versions
-        $script:pmap["Node.JS"].Version | Should -Be '16.19.1'
+        $script:pmap["Node.JS"].Version | Should -Be '16.20.1'
         $script:pmap["PowerShell"].Version | Should -BeLike '7.3*'
     }