Azure-cli: Revert temporary fix which installed az with python (#629)

This commit is contained in:
Samruddhi Khandale 2023-08-16 11:38:49 -07:00 committed by GitHub
parent 1d1a23625d
commit c58b614202
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 3 deletions

View file

@ -1,6 +1,6 @@
{ {
"id": "azure-cli", "id": "azure-cli",
"version": "1.2.0", "version": "1.2.1",
"name": "Azure CLI", "name": "Azure CLI",
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/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.", "description": "Installs the Azure CLI along with needed dependencies. Useful for base Dockerfiles that often are missing required install dependencies like gpg.",
@ -26,7 +26,7 @@
"installUsingPython": { "installUsingPython": {
"type": "boolean", "type": "boolean",
"description": "Install Azure CLI using Python instead of pipx", "description": "Install Azure CLI using Python instead of pipx",
"default": true "default": false
} }
}, },
"customizations": { "customizations": {

View file

@ -141,7 +141,6 @@ install_using_pip_strategy() {
ver="==${AZ_VERSION}" ver="==${AZ_VERSION}"
fi fi
# Temprary quick fix for https://github.com/devcontainers/features/issues/624
if [ "${INSTALL_USING_PYTHON}" = "true" ]; then if [ "${INSTALL_USING_PYTHON}" = "true" ]; then
install_with_complete_python_installation "${ver}" || install_with_pipx "${ver}" || return 1 install_with_complete_python_installation "${ver}" || install_with_pipx "${ver}" || return 1
else else

View file

@ -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

View file

@ -28,5 +28,15 @@
"installBicep": true "installBicep": true
} }
} }
},
"install_with_python": {
"image": "mcr.microsoft.com/devcontainers/base:jammy",
"user": "vscode",
"features": {
"azure-cli": {
"version": "latest",
"installUsingPython": true
}
}
} }
} }