Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

base image update #342

Merged
merged 3 commits into from
Aug 18, 2023
Merged

base image update #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb3f7dd
base image update
hima-gadupudi Aug 17, 2023
77abe77
update test
darrentu Aug 18, 2023
08f1111
Update tools.Dockerfile
darrentu Aug 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion linux/powershell/PSCloudShellUtility/PSCloudShellUtility.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\.]*)?).*"}
Expand Down
5 changes: 3 additions & 2 deletions linux/tools.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/PSinLinuxCloudShellImage.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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*'
}

Expand Down
Loading