From 199adb4dbde0a10d99f52610348d9e3d282e8daa Mon Sep 17 00:00:00 2001 From: necusjz Date: Mon, 29 Sep 2025 15:11:11 +1000 Subject: [PATCH 1/2] feat: add environment variables --- .devcontainer/.env | 4 ++++ .devcontainer/devcontainer.json | 3 ++- .devcontainer/init.sh | 6 ++---- 3 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 .devcontainer/.env diff --git a/.devcontainer/.env b/.devcontainer/.env new file mode 100644 index 00000000000..1a92da89b3c --- /dev/null +++ b/.devcontainer/.env @@ -0,0 +1,4 @@ +AAZ_CLI_PATH="/workspaces/azure-cli" +AAZ_CLI_EXTENSION_PATH="/workspaces/azure-cli-extensions" +AAZ_SWAGGER_PATH="/workspaces/azure-rest-api-specs" +AAZ_PATH="/workspaces/aaz" diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 81e371441e5..82903b8ee52 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -13,5 +13,6 @@ "cpus": 16, "memory": "64gb", "storage": "128gb" - } + }, + "runArgs": ["--env-file", ".devcontainer/.env"], } diff --git a/.devcontainer/init.sh b/.devcontainer/init.sh index e7ea93abc75..2a60f6338df 100644 --- a/.devcontainer/init.sh +++ b/.devcontainer/init.sh @@ -66,9 +66,7 @@ if ! command -v aaz-dev &> /dev/null; then ELAPSED_TIME=$SECONDS echo -e "\n${YELLOW}Elapsed time: $((ELAPSED_TIME / 60))m $((ELAPSED_TIME % 60))s.${NC}" - echo -e "\n${GREEN}Finished setup! Please launch the codegen tool via:${NC}" - echo -e "${GREEN}\$ aaz-dev run -c azure-cli -e azure-cli-extensions -s azure-rest-api-specs -a aaz${NC}\n" + echo -e "\n${GREEN}Finished setup! Please launch the codegen tool via: aaz-dev run${NC}\n" else - echo -e "\nPlease launch the codegen tool via:" - echo -e "$ aaz-dev run -c azure-cli -e azure-cli-extensions -s azure-rest-api-specs -a aaz\n" + echo -e "\nPlease launch the codegen tool via: aaz-dev run\n" fi From 209f6dfe815d5a257a5fca61722e9f67ddb5ba03 Mon Sep 17 00:00:00 2001 From: necusjz Date: Mon, 29 Sep 2025 18:56:02 +1000 Subject: [PATCH 2/2] fix: not string type --- .devcontainer/.env | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.devcontainer/.env b/.devcontainer/.env index 1a92da89b3c..0a2bcbfbe0c 100644 --- a/.devcontainer/.env +++ b/.devcontainer/.env @@ -1,4 +1,4 @@ -AAZ_CLI_PATH="/workspaces/azure-cli" -AAZ_CLI_EXTENSION_PATH="/workspaces/azure-cli-extensions" -AAZ_SWAGGER_PATH="/workspaces/azure-rest-api-specs" -AAZ_PATH="/workspaces/aaz" +AAZ_CLI_PATH=/workspaces/azure-cli +AAZ_CLI_EXTENSION_PATH=/workspaces/azure-cli-extensions +AAZ_SWAGGER_PATH=/workspaces/azure-rest-api-specs +AAZ_PATH=/workspaces/aaz