Skip to content

Fix for nunavut version check and remove JSBSim deb #313

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.

Sign up for GitHub

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

Open
richtong wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for nunavut version check and remove JSBSim deb #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion docker/Dockerfile_base-bionic
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ RUN pip3 install wheel setuptools

# Python 3 dependencies installed by pip
RUN pip3 install argparse argcomplete coverage cerberus empy jinja2 kconfiglib \
matplotlib==3.0.* numpy nunavut>=1.1.0 packaging pkgconfig pyros-genmsg pyulog \
matplotlib==3.0.* numpy "nunavut>=1.1.0" packaging pkgconfig pyros-genmsg pyulog \
pyyaml requests serial six toml psutil pyulog wheel jsonschema

# manual ccache setup
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile_base-focal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ RUN python3 -m pip install --upgrade pip wheel setuptools

# Python 3 dependencies installed by pip
RUN python3 -m pip install argparse argcomplete coverage cerberus empy jinja2 kconfiglib \
matplotlib==3.0.* numpy nunavut>=1.1.0 packaging pkgconfig pyros-genmsg pyulog \
matplotlib==3.0.* numpy "nunavut>=1.1.0" packaging pkgconfig pyros-genmsg pyulog \
pyyaml requests serial six toml psutil pyulog wheel jsonschema pynacl

# manual ccache setup
Expand Down
9 changes: 7 additions & 2 deletions docker/Dockerfile_simulation-bionic
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ ENV QT_X11_NO_MITSHM 1
# Use UTF8 encoding in java tools (needed to compile jMAVSim)
ENV JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8

# so these can change at build time
ARG JSBSIM_URL=https://github.com/JSBSim-Team/jsbsim/releases/download/v1.1.1a
ARG JSBSIM_DEB=JSBSim-devel_1.1.1-134.focal.amd64.deb

# Install JSBSim
RUN wget https://github.com/JSBSim-Team/jsbsim/releases/download/v1.1.1a/JSBSim-devel_1.1.1-134.bionic.amd64.deb
RUN dpkg -i JSBSim-devel_1.1.1-134.bionic.amd64.deb
RUN wget "$JSBSIM_URL/$JSBSIM_DEB" && \
dpkg -i "$JSBSIM_DEB" && \
rm -f "$JSBSIM_DEB"
9 changes: 7 additions & 2 deletions docker/Dockerfile_simulation-focal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ ENV QT_X11_NO_MITSHM 1
# Use UTF8 encoding in java tools (needed to compile jMAVSim)
ENV JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8

# so these can change at build time
ARG JSBSIM_URL=https://github.com/JSBSim-Team/jsbsim/releases/download/v1.1.1a
ARG JSBSIM_DEB=JSBSim-devel_1.1.1-134.focal.amd64.deb

# Install JSBSim
RUN wget https://github.com/JSBSim-Team/jsbsim/releases/download/v1.1.1a/JSBSim-devel_1.1.1-134.focal.amd64.deb
RUN dpkg -i JSBSim-devel_1.1.1-134.focal.amd64.deb
RUN wget "$JSBSIM_URL/$JSBSIM_DEB" && \
dpkg -i "$JSBSIM_DEB" && \
rm -f "$JSBSIM_DEB"