Merge pull request #81 from docker/feature/use-open-external

Update Tailscale sample with `openExternal` API method
docker · Feb 3, 2022 · d8e6a7f · d8e6a7f
2 parents b8296a6 + 7dfe12b
commit d8e6a7f
Showing 5 changed files with 29 additions and 44 deletions.
diff --git a/tailscale/Dockerfile b/tailscale/Dockerfile
@@ -44,7 +44,5 @@ COPY wait-for-exit.sh /app/wait-for-exit.sh
 COPY vm/docker-compose.yaml .
 COPY host/hostname darwin/hostname
 COPY host/hostname.cmd windows/hostname.cmd
-COPY host/tsbrowser darwin/tsbrowser
-COPY host/tsbrowser.cmd windows/tsbrowser.cmd
 ENV TS_HOST_ENV dde
 CMD /app/tailscaled --state=/var/lib/tailscale/tailscaled.state --tun=userspace-networking
diff --git a/tailscale/client/src/App.tsx b/tailscale/client/src/App.tsx
@@ -158,9 +158,7 @@ export function App() {
 
   // start a browser in the host
   function doOpenBrowser(url: string) {
-    window.ddClient
-      .execHostCmd(`tsbrowser ${url}`)
-      .then(() => setStatus(undefined));
+    window.ddClient.openExternal(`${url}`).then(() => setStatus(undefined));
   }
 
   function PrintTableHeaders() {

diff --git a/tailscale/host/tsbrowser b/tailscale/host/tsbrowser
diff --git a/tailscale/host/tsbrowser.cmd b/tailscale/host/tsbrowser.cmd
diff --git a/tailscale/metadata.json b/tailscale/metadata.json
@@ -1,38 +1,31 @@
 {
-    "name":"tailscale",
-    "provider": "Tailscale Inc.",
-    "icon":"tailscale.svg",
-    "vm": {
-        "composefile":"docker-compose.yaml"
-    },
-    "ui":{
-        "dashboard-tab":
-        {
-            "title":"Tailscale",
-            "root":"/ui",
-            "src":"index.html"
-        }
-    },
-    "host": {
-        "binaries": [
-            {
-                "darwin": [
-                    {
-                        "path": "/darwin/hostname"
-                    },
-                    {
-                        "path": "/darwin/tsbrowser"
-                    }
-                ],
-                "windows": [
-                    {
-                        "path": "/windows/hostname.cmd"
-                    },
-                    {
-                        "path": "/windows/tsbrowser.cmd"
-                    }
-                ]
-            }
-        ]
+  "name": "tailscale",
+  "provider": "Tailscale Inc.",
+  "icon": "tailscale.svg",
+  "vm": {
+    "composefile": "docker-compose.yaml"
+  },
+  "ui": {
+    "dashboard-tab": {
+      "title": "Tailscale",
+      "root": "/ui",
+      "src": "index.html"
     }
+  },
+  "host": {
+    "binaries": [
+      {
+        "darwin": [
+          {
+            "path": "/darwin/hostname"
+          }
+        ],
+        "windows": [
+          {
+            "path": "/windows/hostname.cmd"
+          }
+        ]
+      }
+    ]
+  }
 }