Unverified Commit ea2d7907 authored by Samruddhi Khandale's avatar Samruddhi Khandale Committed by GitHub

Azure-cli - Temporary quick fix for jammy (ARM) (#626)

parent 7fcec6e7
{ {
"id": "azure-cli", "id": "azure-cli",
"version": "1.1.0", "version": "1.2.0",
"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.",
...@@ -22,6 +22,11 @@ ...@@ -22,6 +22,11 @@
"type": "boolean", "type": "boolean",
"description": "Optionally install Azure Bicep", "description": "Optionally install Azure Bicep",
"default": false "default": false
},
"installUsingPython": {
"type": "boolean",
"description": "Install Azure CLI using Python instead of pipx",
"default": true
} }
}, },
"customizations": { "customizations": {
......
...@@ -15,7 +15,7 @@ rm -rf /var/lib/apt/lists/* ...@@ -15,7 +15,7 @@ rm -rf /var/lib/apt/lists/*
AZ_VERSION=${VERSION:-"latest"} AZ_VERSION=${VERSION:-"latest"}
AZ_EXTENSIONS=${EXTENSIONS} AZ_EXTENSIONS=${EXTENSIONS}
AZ_INSTALLBICEP=${INSTALLBICEP:-false} AZ_INSTALLBICEP=${INSTALLBICEP:-false}
INSTALL_USING_PYTHON=${INSTALL_USING_PYTHON:-true}
MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc" MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
AZCLI_ARCHIVE_ARCHITECTURES="amd64" AZCLI_ARCHIVE_ARCHITECTURES="amd64"
AZCLI_ARCHIVE_VERSION_CODENAMES="stretch buster bullseye bionic focal jammy" AZCLI_ARCHIVE_VERSION_CODENAMES="stretch buster bullseye bionic focal jammy"
...@@ -141,7 +141,12 @@ install_using_pip_strategy() { ...@@ -141,7 +141,12 @@ 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
install_with_complete_python_installation "${ver}" || install_with_pipx "${ver}" || return 1
else
install_with_pipx "${ver}" || install_with_complete_python_installation "${ver}" || return 1 install_with_pipx "${ver}" || install_with_complete_python_installation "${ver}" || return 1
fi
} }
install_with_pipx() { install_with_pipx() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment