Skip to content

Commit b2c340c

Browse files
committed
Enable npm to build docs in gisnav container
1 parent 2ebe0ce commit b2c340c

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

docker/mavros/Dockerfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,12 @@ RUN apt-get update \
107107
&& rm -rf /var/lib/apt/lists/* \
108108
&& apt clean
109109

110+
# Node 18 for building the docs (Sphinx dependencies already in setup.py)
111+
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash \
112+
&& source ~/.nvm/nvm.sh \
113+
&& nvm install 18 \
114+
&& nvm use 18
115+
110116
ENTRYPOINT ["/entrypoint.sh"]
111117

112118
# TODO: proper health check - check that public facing topics are publishing

docker/mavros/gisnav/entrypoint.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ set -e
44
source "/opt/ros/$ROS_VERSION/setup.bash"
55
source "/opt/colcon_ws/install/setup.bash" --
66

7+
# Ensure we have npm to build docs
8+
source ~/.nvm/nvm.sh
9+
710
# Needed for pip installed dev tools like pre-commit and sphinx-build
811
export PATH=/usr/lib/gisnav:$PATH
912

gisnav/setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,8 @@ def parse_package_data(cls, package_file: str) -> PackageData:
136136
"python-dateutil>=2.8.2",
137137
"pyyaml",
138138
"sphinx-copybutton",
139-
"sphinx-design" "sphinx-markdown-builder==0.6.6",
139+
"sphinx-design",
140+
"sphinx-markdown-builder==0.6.6",
140141
"Sphinx-Substitution-Extensions",
141142
"sphinxcontrib-mermaid",
142143
"sphinxcontrib-video",

0 commit comments

Comments
 (0)