Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[setup] Update cloud packaging for EGL #22197

Merged
merged 1 commit into from
Nov 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions doc/_pages/release_playbook.md
Original file line number Diff line number Diff line change
Expand Up @@ -230,11 +230,9 @@ the email address associated with your github account.
with your github account; otherwise, the file is read-only).
1. For reference, the typical content is thus:
```
FROM robotlocomotion/drake:jammy-20230518
FROM robotlocomotion/drake:jammy-20241114

RUN apt-get -q update && apt-get -q install -y --no-install-recommends nginx-light xvfb && apt-get -q clean

ENV DISPLAY=:1
RUN apt-get -q update && apt-get -q install -y --no-install-recommends nginx-light && apt-get -q clean

ENV PATH="/opt/drake/bin:${PATH}" \
PYTHONPATH="/opt/drake/lib/python3.10/site-packages:${PYTHONPATH}"
Expand All @@ -258,9 +256,7 @@ the email address associated with your github account.
```
%%bash
/opt/drake/share/drake/setup/deepnote/install_nginx
/opt/drake/share/drake/setup/deepnote/install_xvfb
```
In case the display server is not working later on, this might be a good place to double-check.
For Jammy we also needed to add ``cd /work`` atop the stanza that checks for
``requirements.txt`` to get it working again.
5. Copy the updated tutorials from the pinned Dockerfile release
Expand Down
2 changes: 0 additions & 2 deletions setup/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,7 @@ install_files(
],
"//tools/cc_toolchain:linux": [
"deepnote/install_nginx",
"deepnote/install_xvfb",
"deepnote/nginx-meshcat-proxy.conf",
"deepnote/xvfb",
"ubuntu/binary_distribution/install_prereqs.sh",
"ubuntu/binary_distribution/packages-jammy.txt",
"ubuntu/binary_distribution/packages-noble.txt",
Expand Down
3 changes: 0 additions & 3 deletions setup/deepnote/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ The nginx-related files are used by pydrake.geometry.SetupMeshcat() to
configure a Deepnote notebook to allow for MeshCat traffic to flow. Refer
to the implementation in bindings/pydrake/_geometry_extra.py for details.

The xvfb-related files are used to launch an X display suitable for Drake's
image rendering simulations.

Even though these files are used on Ubuntu- or Debian-based systems,
we don't place them under drake/setup/ubuntu/... because they are not
relevant to most Drake users on Ubuntu -- they are only useful for the
Expand Down
17 changes: 0 additions & 17 deletions setup/deepnote/install_xvfb

This file was deleted.

35 changes: 0 additions & 35 deletions setup/deepnote/xvfb

This file was deleted.

1 change: 1 addition & 0 deletions setup/ubuntu/binary_distribution/packages-jammy.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
default-jre
jupyter-notebook
libblas-dev
libegl1
libeigen3-dev
libgfortran5
libglib2.0-0
Expand Down
1 change: 1 addition & 0 deletions setup/ubuntu/binary_distribution/packages-noble.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
default-jre
jupyter-notebook
libblas-dev
libegl1
libeigen3-dev
libgfortran5
libglib2.0-0
Expand Down
4 changes: 2 additions & 2 deletions tools/wheel/content/INSTALLATION
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
For Ubuntu 22.04, install these additional libraries:

sudo apt-get install --no-install-recommends \
libx11-6 libsm6 libglib2.0-0
libegl1 libx11-6 libsm6 libglib2.0-0

For Ubuntu 24.04, install these additional libraries:

sudo apt-get install --no-install-recommends \
libx11-6 libsm6 libglib2.0-0t64
libegl1 libx11-6 libsm6 libglib2.0-0t64

For macOS, ensure that you're using Homebrew Python (not Apple's system Python).