From bb3f7dd8fbefa4e388440ffd2b5b38beff483843 Mon Sep 17 00:00:00 2001 From: Hima Bindu Gadupudi Date: Thu, 17 Aug 2023 11:16:12 -0700 Subject: [PATCH 1/3] base image update --- linux/tools.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/tools.Dockerfile b/linux/tools.Dockerfile index f63a1c3e..9250e99f 100644 --- a/linux/tools.Dockerfile +++ b/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} From 77abe7748944208c00ab501bfed00c1adc714e5f Mon Sep 17 00:00:00 2001 From: darrentu Date: Thu, 17 Aug 2023 18:01:48 -0700 Subject: [PATCH 2/3] update test --- linux/powershell/PSCloudShellUtility/PSCloudShellUtility.psm1 | 2 +- linux/tools.Dockerfile | 3 ++- tests/PSinLinuxCloudShellImage.Tests.ps1 | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/linux/powershell/PSCloudShellUtility/PSCloudShellUtility.psm1 b/linux/powershell/PSCloudShellUtility/PSCloudShellUtility.psm1 index e6899d5b..51604504 100644 --- a/linux/powershell/PSCloudShellUtility/PSCloudShellUtility.psm1 +++ b/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\.]*)?).*"} diff --git a/linux/tools.Dockerfile b/linux/tools.Dockerfile index 9250e99f..846eb803 100644 --- a/linux/tools.Dockerfile +++ b/linux/tools.Dockerfile @@ -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 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 diff --git a/tests/PSinLinuxCloudShellImage.Tests.ps1 b/tests/PSinLinuxCloudShellImage.Tests.ps1 index f720272e..17407215 100755 --- a/tests/PSinLinuxCloudShellImage.Tests.ps1 +++ b/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*' } From 08f1111f045a42df8337c7eb0671e8ed52d10d97 Mon Sep 17 00:00:00 2001 From: Darren Tu Date: Thu, 17 Aug 2023 20:50:17 -0700 Subject: [PATCH 3/3] Update tools.Dockerfile --- linux/tools.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/tools.Dockerfile b/linux/tools.Dockerfile index 846eb803..7d9e1a4e 100644 --- a/linux/tools.Dockerfile +++ b/linux/tools.Dockerfile @@ -48,7 +48,7 @@ RUN curl -Lo bicep https://github.com/Azure/bicep/releases/latest/download/bicep # Temp: fix ansible modules. Proper fix is to update base layer to use regular python for Ansible. RUN mkdir -p /usr/share/ansible/collections/ansible_collections/azure/azcollection/ \ - && wget -nv -q https://raw.githubusercontent.com/ansible-collections/azure/dev/requirements-azure.txt \ + && 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