From 95bac51a23e15ee5997eda638216d36661e575cd Mon Sep 17 00:00:00 2001
From: Tim Kluge <timklge@gmail.com>
Date: Wed, 26 Aug 2020 20:49:46 +0200
Subject: [PATCH] Update readme
---
README.md | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/README.md b/README.md
index 4c262e0..e159019 100644
--- a/README.md
+++ b/README.md
@@ -10,8 +10,7 @@
## Docker
To quickly run the graphical example applications, you can use Docker. For development purposes, please use the regular installation
-instructions further below in this document. Please note that the setup for Windows and Mac OS systems uses X11 forwarding and thus
-offers limited graphics performance.
+instructions further below in this document. Please note that the setup uses vnc and thus offers limited graphics performance.
- Clone this repo and its submodules:
- as a guest: `git clone --recurse-submodules https://git-st.inf.tu-dresden.de/ceti/ros/panda_gazebo_workspace.git panda_gazebo_workspace`
@@ -21,19 +20,14 @@ offers limited graphics performance.
### Linux
- Install Docker for your linux distribution
-- Run `./docker-run.sh roslaunch sample_applications sample_simple_simulation.launch` to build and run a docker image tagged with `ceti-panda-gazebo-workspace`
+- Run `./docker-run-vnc.sh roslaunch sample_applications sample_simple_simulation.launch` to build and run a docker image tagged with `ceti-panda-gazebo-workspace`
+- Open `http://localhost:6901` in a web browser and enter the password `vncpassword`
### Windows 10
- Install [Docker Desktop for Windows](https://hub.docker.com/editions/community/docker-ce-desktop-windows)
-- Install [Xming](https://sourceforge.net/projects/xming/)
-- Run `docker-run.bat roslaunch sample_applications sample_simple_simulation.launch`
-
-### Mac OS
-
-- Install [Docker Destop for Mac OS](https://hub.docker.com/editions/community/docker-ce-desktop-mac)
-- Install [XQuartz](https://www.xquartz.org/). Enable the `Allow connections from network clients` setting in the preferences (`Security` Tab).
-- Run `docker-run-mac.sh roslaunch sample_applications sample_simple_simulation.launch`
+- Run `docker-run-vnc.bat roslaunch sample_applications sample_simple_simulation.launch`
+- Open `http://localhost:6901` in a web browser and enter the password `vncpassword`
## Requirements for development
--
GitLab