Skip to content

Commit

Permalink
Reinstate bash code to generate xauth file for sharing with the conta…
Browse files Browse the repository at this point in the history
…iner

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.
  • Loading branch information
Purg committed Dec 18, 2023
1 parent 2fe2029 commit f15058d
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 1 deletion.
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,18 @@ Workspace root: `./ros/`
System requirements
* ansible
* docker
* docker-compose
* (pip-installed) docker-compose

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

We currently require a pip-installed `docker-compose` tool, as opposed to a
system package-manager installed `docker-compose-plugin` package.
The package manager docker plugin behaves a little differently that our current
docker-compose configuration and scripting does not yet handle.

## Provision Files
External large files should be provisioned by running the ansible tool:

Expand Down
3 changes: 3 additions & 0 deletions angel-workspace-shell.sh
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ mkdir -p "${XAUTH_DIR}"
# Exporting to be used in replacement in docker-compose file.
XAUTH_FILEPATH="$(mktemp "${XAUTH_DIR}/local-XXXXXX.xauth")"
export XAUTH_FILEPATH
log "[INFO] Creating local xauth file: $XAUTH_FILEPATH"
touch "$XAUTH_FILEPATH"
xauth nlist "$DISPLAY" | sed -e 's/^..../ffff/' | xauth -f "$XAUTH_FILEPATH" nmerge -

# Conditionally gather if jupyter is available in the current
# environment and parameterize mounting it's runtime dir
Expand Down
5 changes: 5 additions & 0 deletions tmux/demos/cooking/cooking-angel-system_from-old-bag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,11 @@ windows:
-p image_topic:=PVFramesRGB
-p output_topic:=PVFramesRGB_TS

# # Visualize RGB Images being output from the headset
# - rqt_rgb_images: rqt -s rqt_image_view/ImageView
# --args ${ROS_NAMESPACE}/PVFramesBGR
# --ros-args -p _image_transport:=raw

- object_detector:
layout: even-vertical
panes:
Expand Down

0 comments on commit f15058d

Please sign in to comment.