Propagate local api key env vars to devcontainer (#681)

* Propagate local env vars to devcontainer * Remove empty devcontainer.env file
ag2ai · Jan 28, 2025 · 603065f · 603065f
1 parent 9591ae0
commit 603065f
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 34 deletions.
diff --git a/.devcontainer/devcontainer.env b/.devcontainer/devcontainer.env
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -33,11 +33,18 @@
     "workspaceFolder": "/workspaces/ag2",
     "runArgs": [
         "--name",
-        "python-3.9-ag2",
-        "--env-file",
-        "${localWorkspaceFolder}/.devcontainer/devcontainer.env"
+        "python-3.9-ag2"
     ],
-    "remoteEnv": {},
+    "remoteEnv": {
+        "OAI_CONFIG_LIST": "${localEnv:OAI_CONFIG_LIST}",
+        "ANTHROPIC_API_KEY": "${localEnv:ANTHROPIC_API_KEY}",
+        "AZURE_OPENAI_API_KEY": "${localEnv:AZURE_OPENAI_API_KEY}",
+        "OPENAI_API_KEY": "${localEnv:OPENAI_API_KEY}",
+        "TOGETHER_API_KEY": "${localEnv:TOGETHER_API_KEY}",
+        "GEMINI_API_KEY": "${localEnv:GEMINI_API_KEY}",
+        "AZURE_API_ENDPOINT": "${localEnv:AZURE_API_ENDPOINT}",
+        "AZURE_API_VERSION": "${localEnv:AZURE_API_VERSION}",
+    },
     "features": {
         "ghcr.io/devcontainers/features/common-utils:2": {
             "installZsh": true,

diff --git a/.devcontainer/python-3.10/devcontainer.json b/.devcontainer/python-3.10/devcontainer.json
@@ -33,11 +33,18 @@
     "workspaceFolder": "/workspaces/ag2",
     "runArgs": [
         "--name",
-        "python-3.10-ag2",
-        "--env-file",
-        "${localWorkspaceFolder}/.devcontainer/devcontainer.env"
+        "python-3.10-ag2"
     ],
-    "remoteEnv": {},
+    "remoteEnv": {
+        "OAI_CONFIG_LIST": "${localEnv:OAI_CONFIG_LIST}",
+        "ANTHROPIC_API_KEY": "${localEnv:ANTHROPIC_API_KEY}",
+        "AZURE_OPENAI_API_KEY": "${localEnv:AZURE_OPENAI_API_KEY}",
+        "OPENAI_API_KEY": "${localEnv:OPENAI_API_KEY}",
+        "TOGETHER_API_KEY": "${localEnv:TOGETHER_API_KEY}",
+        "GEMINI_API_KEY": "${localEnv:GEMINI_API_KEY}",
+        "AZURE_API_ENDPOINT": "${localEnv:AZURE_API_ENDPOINT}",
+        "AZURE_API_VERSION": "${localEnv:AZURE_API_VERSION}",
+    },
     "features": {
         "ghcr.io/devcontainers/features/common-utils:2": {
             "installZsh": true,

diff --git a/.devcontainer/python-3.11/devcontainer.json b/.devcontainer/python-3.11/devcontainer.json
@@ -33,11 +33,18 @@
     "workspaceFolder": "/workspaces/ag2",
     "runArgs": [
         "--name",
-        "python-3.11-ag2",
-        "--env-file",
-        "${localWorkspaceFolder}/.devcontainer/devcontainer.env"
+        "python-3.11-ag2"
     ],
-    "remoteEnv": {},
+    "remoteEnv": {
+        "OAI_CONFIG_LIST": "${localEnv:OAI_CONFIG_LIST}",
+        "ANTHROPIC_API_KEY": "${localEnv:ANTHROPIC_API_KEY}",
+        "AZURE_OPENAI_API_KEY": "${localEnv:AZURE_OPENAI_API_KEY}",
+        "OPENAI_API_KEY": "${localEnv:OPENAI_API_KEY}",
+        "TOGETHER_API_KEY": "${localEnv:TOGETHER_API_KEY}",
+        "GEMINI_API_KEY": "${localEnv:GEMINI_API_KEY}",
+        "AZURE_API_ENDPOINT": "${localEnv:AZURE_API_ENDPOINT}",
+        "AZURE_API_VERSION": "${localEnv:AZURE_API_VERSION}",
+    },
     "features": {
         "ghcr.io/devcontainers/features/common-utils:2": {
             "installZsh": true,

diff --git a/.devcontainer/python-3.12/devcontainer.json b/.devcontainer/python-3.12/devcontainer.json
@@ -33,11 +33,18 @@
     "workspaceFolder": "/workspaces/ag2",
     "runArgs": [
         "--name",
-        "python-3.12-ag2",
-        "--env-file",
-        "${localWorkspaceFolder}/.devcontainer/devcontainer.env"
+        "python-3.12-ag2"
     ],
-    "remoteEnv": {},
+    "remoteEnv": {
+        "OAI_CONFIG_LIST": "${localEnv:OAI_CONFIG_LIST}",
+        "ANTHROPIC_API_KEY": "${localEnv:ANTHROPIC_API_KEY}",
+        "AZURE_OPENAI_API_KEY": "${localEnv:AZURE_OPENAI_API_KEY}",
+        "OPENAI_API_KEY": "${localEnv:OPENAI_API_KEY}",
+        "TOGETHER_API_KEY": "${localEnv:TOGETHER_API_KEY}",
+        "GEMINI_API_KEY": "${localEnv:GEMINI_API_KEY}",
+        "AZURE_API_ENDPOINT": "${localEnv:AZURE_API_ENDPOINT}",
+        "AZURE_API_VERSION": "${localEnv:AZURE_API_VERSION}",
+    },
     "features": {
         "ghcr.io/devcontainers/features/common-utils:2": {
             "installZsh": true,

diff --git a/.devcontainer/python-3.13/devcontainer.json b/.devcontainer/python-3.13/devcontainer.json
@@ -33,11 +33,18 @@
     "workspaceFolder": "/workspaces/ag2",
     "runArgs": [
         "--name",
-        "python-3.13-ag2",
-        "--env-file",
-        "${localWorkspaceFolder}/.devcontainer/devcontainer.env"
+        "python-3.13-ag2"
     ],
-    "remoteEnv": {},
+    "remoteEnv": {
+        "OAI_CONFIG_LIST": "${localEnv:OAI_CONFIG_LIST}",
+        "ANTHROPIC_API_KEY": "${localEnv:ANTHROPIC_API_KEY}",
+        "AZURE_OPENAI_API_KEY": "${localEnv:AZURE_OPENAI_API_KEY}",
+        "OPENAI_API_KEY": "${localEnv:OPENAI_API_KEY}",
+        "TOGETHER_API_KEY": "${localEnv:TOGETHER_API_KEY}",
+        "GEMINI_API_KEY": "${localEnv:GEMINI_API_KEY}",
+        "AZURE_API_ENDPOINT": "${localEnv:AZURE_API_ENDPOINT}",
+        "AZURE_API_VERSION": "${localEnv:AZURE_API_VERSION}",
+    },
     "features": {
         "ghcr.io/devcontainers/features/common-utils:2": {
             "installZsh": true,

diff --git a/scripts/devcontainer/templates/devcontainer.json.jinja b/scripts/devcontainer/templates/devcontainer.json.jinja
@@ -33,11 +33,18 @@
     "workspaceFolder": "/workspaces/ag2",
     "runArgs": [
         "--name",
-        "python-{{ python_version }}-ag2",
-        "--env-file",
-        "${localWorkspaceFolder}/.devcontainer/devcontainer.env"
+        "python-{{ python_version }}-ag2"
     ],
-    "remoteEnv": {},
+    "remoteEnv": {
+        "OAI_CONFIG_LIST": "${localEnv:OAI_CONFIG_LIST}",
+        "ANTHROPIC_API_KEY": "${localEnv:ANTHROPIC_API_KEY}",
+        "AZURE_OPENAI_API_KEY": "${localEnv:AZURE_OPENAI_API_KEY}",
+        "OPENAI_API_KEY": "${localEnv:OPENAI_API_KEY}",
+        "TOGETHER_API_KEY": "${localEnv:TOGETHER_API_KEY}",
+        "GEMINI_API_KEY": "${localEnv:GEMINI_API_KEY}",
+        "AZURE_API_ENDPOINT": "${localEnv:AZURE_API_ENDPOINT}",
+        "AZURE_API_VERSION": "${localEnv:AZURE_API_VERSION}",
+    },
     "features": {
         "ghcr.io/devcontainers/features/common-utils:2": {
             "installZsh": true,