Skip to content

Commit

Permalink
Azure-cli: Revert temporary fix which installed az with python (#629)
Browse files Browse the repository at this point in the history
  • Loading branch information
samruddhikhandale authored Aug 16, 2023
1 parent 1d1a236 commit c58b614
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/azure-cli/devcontainer-feature.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "azure-cli",
"version": "1.2.0",
"version": "1.2.1",
"name": "Azure CLI",
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/azure-cli",
"description": "Installs the Azure CLI along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
Expand All @@ -26,7 +26,7 @@
"installUsingPython": {
"type": "boolean",
"description": "Install Azure CLI using Python instead of pipx",
"default": true
"default": false
}
},
"customizations": {
Expand Down
1 change: 0 additions & 1 deletion src/azure-cli/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ install_using_pip_strategy() {
ver="==${AZ_VERSION}"
fi

# Temprary quick fix for https://github.com/devcontainers/features/issues/624
if [ "${INSTALL_USING_PYTHON}" = "true" ]; then
install_with_complete_python_installation "${ver}" || install_with_pipx "${ver}" || return 1
else
Expand Down
14 changes: 14 additions & 0 deletions test/azure-cli/install_with_python.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/bin/bash

set -e

# Import test library for `check` command
source dev-container-features-test-lib

# Check to make sure the user is vscode
check "user is vscode" whoami | grep vscode
check "version" az --version


# Report result
reportResults
10 changes: 10 additions & 0 deletions test/azure-cli/scenarios.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,15 @@
"installBicep": true
}
}
},
"install_with_python": {
"image": "mcr.microsoft.com/devcontainers/base:jammy",
"user": "vscode",
"features": {
"azure-cli": {
"version": "latest",
"installUsingPython": true
}
}
}
}

0 comments on commit c58b614

Please sign in to comment.