Skip to content

Commit 8d0e017

Browse files
authored
Merge pull request #293499 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 8a28b37 + 684ee8f commit 8d0e017

File tree

2 files changed

+33
-3
lines changed

2 files changed

+33
-3
lines changed

articles/azure-functions/functions-reference-python.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Python v1 programming model:
6666
+ [Visual Studio Code](./create-first-function-vs-code-python.md?pivots=python-mode-configuration)
6767
+ [Terminal or command prompt](./create-first-function-cli-python.md?pivots=python-mode-configuration)
6868

69-
You can also create Python v1 functions in the Azure portal.
69+
You can also create Python functions in the Azure portal.
7070

7171
> [!TIP]
7272
> Although you can develop your Python-based Azure functions locally on Windows, Python is supported only on a Linux-based hosting plan when it's running in Azure. For more information, see the [list of supported operating system/runtime combinations](functions-scale.md#operating-systemruntime).

articles/container-apps/azure-resource-manager-api-spec.md

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: container-apps
55
author: craigshoemaker
66
ms.service: azure-container-apps
77
ms.topic: reference
8-
ms.date: 12/04/2024
8+
ms.date: 01/23/2025
99
ms.author: cshoe
1010
ms.custom: build-2023
1111
---
@@ -295,7 +295,17 @@ The following example ARM template snippet deploys a container app.
295295
"mountPath": "/mysecrets",
296296
"volumeName": "mysecrets"
297297
}
298-
]
298+
],
299+
"env": [
300+
{
301+
"name": "non-secret-env-var",
302+
"value": "non-secret env var value"
303+
},
304+
{
305+
"name": "secret-env-var",
306+
"secretRef": "mysecret"
307+
}
308+
]
299309
}
300310
],
301311
"initContainers": [
@@ -312,6 +322,16 @@ The following example ARM template snippet deploys a container app.
312322
"args": [
313323
"-c",
314324
"while true; do echo hello; sleep 10;done"
325+
],
326+
"env": [
327+
{
328+
"name": "non-secret-env-var",
329+
"value": "non-secret env var value"
330+
},
331+
{
332+
"name": "secret-env-var",
333+
"secretRef": "mysecret"
334+
}
315335
]
316336
}
317337
],
@@ -452,6 +472,11 @@ properties:
452472
volumeName: azure-files-volume
453473
- mountPath: "/mysecrets"
454474
volumeName: mysecrets
475+
env:
476+
- name: "non-secret-env-var"
477+
value: "non-secret env var value"
478+
- name: "secret-env-var"
479+
secretRef: "mysecret"
455480
initContainers:
456481
- image: repo/testcontainerApp0:v4
457482
name: testinitcontainerApp0
@@ -463,6 +488,11 @@ properties:
463488
args:
464489
- "-c"
465490
- while true; do echo hello; sleep 10;done
491+
env:
492+
- name: "non-secret-env-var"
493+
value: "non-secret env var value"
494+
- name: "secret-env-var"
495+
secretRef: "mysecret"
466496
scale:
467497
minReplicas: 1
468498
maxReplicas: 5

0 commit comments

Comments
 (0)