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.

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

Install azure-cli for jammy #75

Merged
merged 9 commits into from
Aug 16, 2023
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
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
15 changes: 6 additions & 9 deletions ubuntu.22.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM ubuntu:22.04
ARG Aws_Cli_Version=2.0.60
ARG Aws_Iam_Authenticator_Version=0.5.3
ARG Aws_Powershell_Version=4.1.2
ARG Azure_Cli_Version=2.44.1-1~bionic
ARG Azure_Cli_Version=2.51.0-1~jammy
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we bump the Windows version to 2.51 as well?

ARG Azure_Powershell_Version=4.5.0
ARG Dotnet_Sdk_Version=6.0
ARG Ecs_Cli_Version=1.20.0
Expand Down Expand Up @@ -80,15 +80,12 @@ RUN apt-get install -y openjdk-11-jdk-headless=${Java_Jdk_Version}
RUN apt-get update && \
apt-get install -y maven gradle

# Get Libssl 1.1, required for Azure CLI as of Ubuntu 22.04. This can be removed when a proper Azure CLI ubuntu 22.04 version is avaliable
RUN wget http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_amd64.deb && \
dpkg -i libssl1.1_1.1.1f-1ubuntu2_amd64.deb && \
rm -i libssl1.1_1.1.1f-1ubuntu2_amd64.deb

# Get Azure CLI
# https://docs.microsoft.com/en-us/cli/azure/install-azure-cli-apt?view=azure-cli-latest
RUN wget --quiet -O - https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/trusted.gpg.d/microsoft.asc.gpg > /dev/null && \
echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ bionic main" | tee /etc/apt/sources.list.d/azure-cli.list && \
# https://learn.microsoft.com/en-us/cli/azure/install-azure-cli-linux?pivots=apt#option-2-step-by-step-installation-instructions
RUN mkdir -p /etc/apt/keyrings && \
curl -sLS https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/keyrings/microsoft.gpg > /dev/null && \
chmod go+r /etc/apt/keyrings/microsoft.gpg && \
echo "deb [arch=`dpkg --print-architecture` signed-by=/etc/apt/keyrings/microsoft.gpg] https://packages.microsoft.com/repos/azure-cli/ jammy main" | tee /etc/apt/sources.list.d/azure-cli.list && \
apt-get update && \
apt-get install -y azure-cli=${Azure_Cli_Version}

Expand Down
2 changes: 1 addition & 1 deletion ubuntu.22.04/spec/ubuntu.22.04.tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Describe 'installed dependencies' {

It 'has az installed' {
$output = (& az version) | convertfrom-json
$output.'azure-cli' | Should -be '2.44.1'
$output.'azure-cli' | Should -be '2.51.0'
$LASTEXITCODE | Should -be 0
}

Expand Down
2 changes: 1 addition & 1 deletion windows.ltsc2019/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ SHELL ["powershell", "-Command"]
ARG Aws_Cli_Version=2.0.60
ARG Aws_Iam_Authenticator_Version=0.5.3
ARG Aws_Powershell_Version=4.1.2
ARG Azure_Cli_Version=2.44.0
ARG Azure_Cli_Version=2.51.0
ARG Azure_Powershell_Version=4.5.0
ARG Eks_Cli_Version=0.25.0
ARG Google_Cloud_Cli_Version=412.0.0
Expand Down
2 changes: 1 addition & 1 deletion windows.ltsc2019/spec/windows.ltsc2019.tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Describe 'installed dependencies' {

It 'has az installed' {
$output = (& az version) | convertfrom-json
$output.'azure-cli' | Should -Be '2.44.0'
$output.'azure-cli' | Should -Be '2.51.0'
$LASTEXITCODE | Should -be 0
}

Expand Down