resolve merge conflicts

telepresenceio · Sep 24, 2021 · e2bc857 · e2bc857
2 parents 2b051fd + 068d676
commit e2bc857
Showing 1 changed file with 23 additions and 5 deletions.
diff --git a/quick-start/demo-node.md b/quick-start/demo-node.md
@@ -13,6 +13,7 @@ PreviewUrl,
 ExternalIp
 } from '../../../../../src/components/Docs/Telepresence';
 import Alert from '@material-ui/lab/Alert';
+import Platform from '@src/components/Platform';
 import QSCards from './qs-cards';
 import { UserInterceptCommand, DemoClusterWarning } from '../../../../../src/components/Docs/Telepresence';
 
@@ -73,12 +74,29 @@ We'll set up a development environment locally on your workstation. We'll then u
 
 1. Run the Docker container locally:
 
-    <DockerCommand/>
+<Platform.TabGroup>
+<Platform.MacOSTab>
 
-    <Alert severity="info">
-    Make sure that ports <strong>8080</strong> and <strong>8083</strong> are free. <br/>
-    If the Docker engine is not running, the command will fail and you will see <strong>docker: unknown server OS</strong> in your terminal.
-    </Alert>
+<DockerCommand osType="macos"/>
+
+</Platform.MacOSTab>
+<Platform.GNULinuxTab>
+
+<DockerCommand osType="linux"/>
+
+</Platform.GNULinuxTab>
+<Platform.WindowsTab>
+
+<DockerCommand osType="windows"/>
+
+</Platform.WindowsTab>
+</Platform.TabGroup>
+
+
+<Alert severity="info">
+Make sure that ports <strong>8080</strong> and <strong>8083</strong> are free. <br/>
+If the Docker engine is not running, the command will fail and you will see <strong>docker: unknown server OS</strong> in your terminal.
+</Alert>
 
 2. The Docker container includes a copy of the Emojivoto application that fixes the bug. Visit the [leaderboard](http://localhost:8083/leaderboard) and notice how it is different from the leaderboard in your <ExternalIp>Kubernetes cluster</ExternalIp>.