Skip to content

Commit f15058d

Browse files
committed
Reinstate bash code to generate xauth file for sharing with the container
For some reason this was removed in an earlier commit relating to adding jupyter notebook runtime mounting with no indication as to why. Interpreting this as a mistake as I can confirm that X-pass through graphics tools no longer work with the current setup, but renew working when adding back in proper temporary xauth files for the containers to use. Added a note that we currently only support a pip-installed docker-compose tool.
1 parent 2fe2029 commit f15058d

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

README.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,18 @@ Workspace root: `./ros/`
7878
System requirements
7979
* ansible
8080
* docker
81-
* docker-compose
81+
* (pip-installed) docker-compose
8282

8383
Some files required from the `https://data.kitware.com` Girder service require
8484
authentication due to their protected nature.
8585
The environment variable `GIRDER_API_KEY` must be defined with a valid API key,
8686
otherwise an authentication token cannot be retrieved.
8787

88+
We currently require a pip-installed `docker-compose` tool, as opposed to a
89+
system package-manager installed `docker-compose-plugin` package.
90+
The package manager docker plugin behaves a little differently that our current
91+
docker-compose configuration and scripting does not yet handle.
92+
8893
## Provision Files
8994
External large files should be provisioned by running the ansible tool:
9095

angel-workspace-shell.sh

+3
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ mkdir -p "${XAUTH_DIR}"
7777
# Exporting to be used in replacement in docker-compose file.
7878
XAUTH_FILEPATH="$(mktemp "${XAUTH_DIR}/local-XXXXXX.xauth")"
7979
export XAUTH_FILEPATH
80+
log "[INFO] Creating local xauth file: $XAUTH_FILEPATH"
81+
touch "$XAUTH_FILEPATH"
82+
xauth nlist "$DISPLAY" | sed -e 's/^..../ffff/' | xauth -f "$XAUTH_FILEPATH" nmerge -
8083

8184
# Conditionally gather if jupyter is available in the current
8285
# environment and parameterize mounting it's runtime dir

tmux/demos/cooking/cooking-angel-system_from-old-bag.yml

+5
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,11 @@ windows:
6969
-p image_topic:=PVFramesRGB
7070
-p output_topic:=PVFramesRGB_TS
7171

72+
# # Visualize RGB Images being output from the headset
73+
# - rqt_rgb_images: rqt -s rqt_image_view/ImageView
74+
# --args ${ROS_NAMESPACE}/PVFramesBGR
75+
# --ros-args -p _image_transport:=raw
76+
7277
- object_detector:
7378
layout: even-vertical
7479
panes:

0 commit comments

Comments
 (0)