Merge pull request #1275 from OfficeDev/main

build: merge back to dev after publish 5.8.0
OfficeDev · May 16, 2024 · 93bec57 · 93bec57
2 parents eb87a82 + abc25fa
commit 93bec57
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/bot-sso-docker/README.md b/bot-sso-docker/README.md
@@ -64,10 +64,10 @@ This sample demonstrate how to containerize a Teams App and integrate the Docker
       BOT_DOMAIN=sample-id-3978.devtunnels.ms
       BOT_ENDPOINT=https://sample-id-3978.devtunnels.ms
       ```
-  1.  Run command: `teamsfx provision --env local` .
+  1.  Run command: `teamsapp provision --env local` .
   1.  Run command: `docker build -t sso-bot ./` .
   1.  Run command: `docker run -p 3978:80 --env-file .localConfigs sso-bot` .
-  1.  Run command: `teamsfx preview --open-only` .
+  1.  Run command: `teamsapp preview --open-only` .
 
 ### Deploy the app to Azure
 
@@ -77,17 +77,17 @@ This sample demonstrate how to containerize a Teams App and integrate the Docker
   1. Login Azure CLI with commands: `az login` and `az account set -s <subscription-id>`.
   1. Click `Deploy` or open the command palette and select: `Teams: Deploy`.
 - From TeamsFx CLI:
-  1. Run command: `teamsfx account login azure` .
-  1. Run command: `teamsfx provision --env dev` .
+  1. Run command: `teamsapp account login azure` .
+  1. Run command: `teamsapp provision --env dev` .
   1. Run command: `az login` .
-  1. Run command: `teamsfx deploy --env dev` .
+  1. Run command: `teamsapp deploy --env dev` .
 
 ### Preview the app in Teams
 
 - From VS Code:
   1. Open the `Run and Debug Activity` Panel. Select `Launch Remote (Edge)` or `Launch Remote (Chrome)` from the launch configuration drop-down.
 - From TeamsFx CLI:
-  1. Run command: `teamsfx preview --env dev`.
+  1. Run command: `teamsapp preview --env dev`.
 
 ## Further reading
 

diff --git a/hello-world-tab-with-backend/teamsapp.local.yml b/hello-world-tab-with-backend/teamsapp.local.yml
@@ -63,6 +63,20 @@ provision:
       appPackagePath: ./appPackage/build/appPackage.${{TEAMSFX_ENV}}.zip # Relative path to teamsfx folder. This is the path for built zip file.
 
 deploy:
+  # Install development tool(s)
+  - uses: devTool/install
+    with:
+      devCert:
+        trust: true
+      func:
+        version: ~4.0.5455
+        symlinkDir: ./devTools/func
+    # Write the information of installed development tool(s) into environment
+    # file for the specified environment variable(s).
+    writeToEnvironmentFile:
+      sslCertFile: SSL_CRT_FILE
+      sslKeyFile: SSL_KEY_FILE
+      funcPath: FUNC_PATH
   # Run npm command
   - uses: cli/runNpmCommand
     with:
@@ -82,6 +96,8 @@ deploy:
         BROWSER: none
         HTTPS: true
         PORT: 53000
+        SSL_CRT_FILE: ${{SSL_CRT_FILE}}
+        SSL_KEY_FILE: ${{SSL_KEY_FILE}}
         REACT_APP_CLIENT_ID: ${{AAD_APP_CLIENT_ID}}
         REACT_APP_START_LOGIN_PAGE_URL: ${{TAB_ENDPOINT}}/auth-start.html
         REACT_APP_FUNC_NAME: ${{FUNC_NAME}}