From bf7e9b32c0fd46361be11cce5a18e1f735f5d57c Mon Sep 17 00:00:00 2001 From: Harikrishnan Rajandiran Date: Mon, 8 Apr 2024 15:38:17 +0530 Subject: [PATCH 1/4] Include devcontainer.json file in sample apps to open in codespaces --- .../devcontainer.json | 7 +++++++ .devcontainer/tab-adaptive-cards-nodejs/devcontainer.json | 7 +++++++ .../tab-personal-sso-quickstart-nodejs/devcontainer.json | 7 +++++++ docker-compose.yml | 8 ++++++++ 4 files changed, 29 insertions(+) create mode 100644 .devcontainer/bot-formatting-cards-container-nodejs/devcontainer.json create mode 100644 .devcontainer/tab-adaptive-cards-nodejs/devcontainer.json create mode 100644 .devcontainer/tab-personal-sso-quickstart-nodejs/devcontainer.json create mode 100644 docker-compose.yml diff --git a/.devcontainer/bot-formatting-cards-container-nodejs/devcontainer.json b/.devcontainer/bot-formatting-cards-container-nodejs/devcontainer.json new file mode 100644 index 0000000000..8422be0269 --- /dev/null +++ b/.devcontainer/bot-formatting-cards-container-nodejs/devcontainer.json @@ -0,0 +1,7 @@ +{ + "name": "bot-formatting-cards-container-nodejs", + "dockerComposeFile": ["../../docker-compose.yml"], + "service": "nodejs", + "shutdownAction": "none", + "workspaceFolder": "/workspace/samples/bot-formatting-cards/nodejs" +} diff --git a/.devcontainer/tab-adaptive-cards-nodejs/devcontainer.json b/.devcontainer/tab-adaptive-cards-nodejs/devcontainer.json new file mode 100644 index 0000000000..cf0cd3ec5c --- /dev/null +++ b/.devcontainer/tab-adaptive-cards-nodejs/devcontainer.json @@ -0,0 +1,7 @@ +{ + "name": "tab-adaptive-cards-nodejs", + "dockerComposeFile": ["../../docker-compose.yml"], + "service": "nodejs", + "shutdownAction": "none", + "workspaceFolder": "/workspace/samples/tab-adaptive-cards/nodejs" +} diff --git a/.devcontainer/tab-personal-sso-quickstart-nodejs/devcontainer.json b/.devcontainer/tab-personal-sso-quickstart-nodejs/devcontainer.json new file mode 100644 index 0000000000..dd916ff603 --- /dev/null +++ b/.devcontainer/tab-personal-sso-quickstart-nodejs/devcontainer.json @@ -0,0 +1,7 @@ +{ + "name": "tab-personal-sso-quickstart-nodejs", + "dockerComposeFile": ["../../docker-compose.yml"], + "service": "nodejs", + "shutdownAction": "none", + "workspaceFolder": "/workspace/samples/tab-personal-sso-quickstart/js" +} diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000000..84c2a73c33 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,8 @@ +version: '3' +services: + nodejs: + image: mcr.microsoft.com/devcontainers/typescript-node:1-20-bookworm + volumes: + # Mount the root folder that contains .git + - .:/workspace:cached + command: sleep infinity \ No newline at end of file From d941a638a526677aa01fcc1603de8564fe2b6dae Mon Sep 17 00:00:00 2001 From: Harikrishnan Rajandiran Date: Mon, 15 Apr 2024 14:52:15 +0530 Subject: [PATCH 2/4] Add Python container --- .../bot-conversation-python/devcontainer.json | 7 +++++++ docker-compose.yml | 13 ++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 .devcontainer/bot-conversation-python/devcontainer.json diff --git a/.devcontainer/bot-conversation-python/devcontainer.json b/.devcontainer/bot-conversation-python/devcontainer.json new file mode 100644 index 0000000000..6c59fe672d --- /dev/null +++ b/.devcontainer/bot-conversation-python/devcontainer.json @@ -0,0 +1,7 @@ +{ + "name": "bot-conversation-python", + "dockerComposeFile": ["../../docker-compose.yml"], + "service": "Python", + "shutdownAction": "none", + "workspaceFolder": "/workspace/samples/bot-conversation/python" +} diff --git a/docker-compose.yml b/docker-compose.yml index 84c2a73c33..48b61b175e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,8 +1,19 @@ version: '3' services: + Python: + image: mcr.microsoft.com/devcontainers/python:1-3.8-bookworm + volumes: + # Mount the root folder that contains .git + - .:/workspace:cached + command: sleep infinity + links: + - nodejs + # ... + nodejs: image: mcr.microsoft.com/devcontainers/typescript-node:1-20-bookworm volumes: # Mount the root folder that contains .git - .:/workspace:cached - command: sleep infinity \ No newline at end of file + command: sleep infinity + # ... \ No newline at end of file From 7d2866acdf671e7a69513d843c190a527a4d7375 Mon Sep 17 00:00:00 2001 From: Harikrishnan Rajandiran Date: Mon, 15 Apr 2024 15:06:55 +0530 Subject: [PATCH 3/4] msgext-link-unfurling python --- .../msgext-link-unfurling-python/devcontainer.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .devcontainer/msgext-link-unfurling-python/devcontainer.json diff --git a/.devcontainer/msgext-link-unfurling-python/devcontainer.json b/.devcontainer/msgext-link-unfurling-python/devcontainer.json new file mode 100644 index 0000000000..097883e5dd --- /dev/null +++ b/.devcontainer/msgext-link-unfurling-python/devcontainer.json @@ -0,0 +1,7 @@ +{ + "name": "msgext-link-unfurling-python", + "dockerComposeFile": ["../../docker-compose.yml"], + "service": "Python", + "shutdownAction": "none", + "workspaceFolder": "/workspace/samples/msgext-link-unfurling/python" +} From ca53e590e3c94057fb2674b2bd8cda66b6b26ee6 Mon Sep 17 00:00:00 2001 From: Harikrishnan Rajandiran Date: Mon, 15 Apr 2024 17:15:19 +0530 Subject: [PATCH 4/4] app-hello-world csharp --- .devcontainer/app-hello-world-csharp/devcontainer.json | 7 +++++++ docker-compose.yml | 10 ++++++++++ 2 files changed, 17 insertions(+) create mode 100644 .devcontainer/app-hello-world-csharp/devcontainer.json diff --git a/.devcontainer/app-hello-world-csharp/devcontainer.json b/.devcontainer/app-hello-world-csharp/devcontainer.json new file mode 100644 index 0000000000..b76da6fc24 --- /dev/null +++ b/.devcontainer/app-hello-world-csharp/devcontainer.json @@ -0,0 +1,7 @@ +{ + "name": "app-hello-world-csharp", + "dockerComposeFile": ["../../docker-compose.yml"], + "service": "csharp", + "shutdownAction": "none", + "workspaceFolder": "/workspace/samples/app-hello-world/csharp/Microsoft.Teams.Samples.HelloWorld.Web" +} diff --git a/docker-compose.yml b/docker-compose.yml index 48b61b175e..08b9c85aa7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,4 +16,14 @@ services: # Mount the root folder that contains .git - .:/workspace:cached command: sleep infinity + links: + - csharp + # ... + + csharp: + image: mcr.microsoft.com/devcontainers/dotnet:0-6.0 + volumes: + # Mount the root folder that contains .git + - .:/workspace:cached + command: sleep infinity # ... \ No newline at end of file