Skip to content

Commit 6af8e83

Browse files
committed
Update features from sources
1 parent 8018697 commit 6af8e83

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Contributions, issues and such are welcomed **in their own open source projects*
1212
| Name | Latest Tag | Feature Path |
1313
| --- | --- | --- |
1414
| [AWS cli](./src/aws-cli/README.md) | [v0.1.0](https://gitlab.com/geekstuff.dev/devcontainers/features/aws-cli/-/tree/v0.1.0) | [ghcr.io/geekstuff-dev/devcontainers-features/aws-cli](https://github.com/users/geekstuff-dev/packages/container/package/devcontainers-features%2Faws-cli) |
15-
| [Azure CLI](./src/azure-cli/README.md) | [v0.2.0](https://gitlab.com/geekstuff.dev/devcontainers/features/azure-cli/-/tree/v0.2.0) | [ghcr.io/geekstuff-dev/devcontainers-features/azure-cli](https://github.com/users/geekstuff-dev/packages/container/package/devcontainers-features%2Fazure-cli) |
15+
| [Azure CLI](./src/azure-cli/README.md) | [v0.2.1](https://gitlab.com/geekstuff.dev/devcontainers/features/azure-cli/-/tree/v0.2.1) | [ghcr.io/geekstuff-dev/devcontainers-features/azure-cli](https://github.com/users/geekstuff-dev/packages/container/package/devcontainers-features%2Fazure-cli) |
1616
| [Basics](./src/basics/README.md) | [v1.1.3](https://gitlab.com/geekstuff.dev/devcontainers/features/basics/-/tree/v1.1.3) | [ghcr.io/geekstuff-dev/devcontainers-features/basics](https://github.com/users/geekstuff-dev/packages/container/package/devcontainers-features%2Fbasics) |
1717
| [Direnv](./src/direnv/README.md) | [v0.2.2](https://gitlab.com/geekstuff.dev/devcontainers/features/direnv/-/tree/v0.2.2) | [ghcr.io/geekstuff-dev/devcontainers-features/direnv](https://github.com/users/geekstuff-dev/packages/container/package/devcontainers-features%2Fdirenv) |
1818
| [Docker](./src/docker/README.md) | [v0.1.9](https://gitlab.com/geekstuff.dev/devcontainers/features/docker/-/tree/v0.1.9) | [ghcr.io/geekstuff-dev/devcontainers-features/docker](https://github.com/users/geekstuff-dev/packages/container/package/devcontainers-features%2Fdocker) |

src/azure-cli/assets/azure.envrc

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
export AZURE_CONFIG_DIR=${AZURE_CONFIG_DIR:-/home/dev/.azure}
22

3-
watch_file ${AZURE_CONFIG_DIR}/az.json
3+
# Auto reload when that file is updated
44
watch_file ${AZURE_CONFIG_DIR}/azureProfile.json
55

6-
if ! az account show &>/dev/null; then
7-
err "not logged in to azure." "make az-login" && return 1
8-
fi
9-
10-
if test -z "${AZURE_SUBSCRIPTION_ID}"; then
11-
err "set AZURE_SUBSCRIPTION_ID value somewhere" && return 1
6+
# Check if logged into Azure
7+
if ! az account list-locations -o none &>/dev/null; then
8+
AZ_HELPER_CMD=${AZ_HELPER_CMD:-"az login"}
9+
err "not logged in to azure." "$AZ_HELPER_CMD"
10+
return 1
1211
fi

src/azure-cli/devcontainer-feature.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"name": "Azure CLI",
33
"id": "azure-cli",
4-
"version": "0.2.0",
4+
"version": "0.2.1",
55
"description": "Installs Azure CLI",
6-
"documentationURL": "https://gitlab.com/geekstuff.dev/devcontainers/features/azure-cli/-/blob/v0.2.0/README.md",
7-
"licenseURL": "https://gitlab.com/geekstuff.dev/devcontainers/features/azure-cli/-/blob/v0.2.0/LICENSE",
6+
"documentationURL": "https://gitlab.com/geekstuff.dev/devcontainers/features/azure-cli/-/blob/v0.2.1/README.md",
7+
"licenseURL": "https://gitlab.com/geekstuff.dev/devcontainers/features/azure-cli/-/blob/v0.2.1/LICENSE",
88
"installsAfter": [
99
"ghcr.io/geekstuff-dev/devcontainers-features/basics",
1010
"ghcr.io/geekstuff-dev/devcontainers-features/docker"

0 commit comments

Comments
 (0)