Skip to content

move yq to base docker images, fix a few docu typos #217

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

Merged
flipflip8952 merged 2 commits into from
Aug 25, 2026
Merged

move yq to base docker images, fix a few docu typos #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc4be24
fix some typos in docu
flipflip8952 Aug 25, 2026
ecb0b9c
move yq to base images
flipflip8952 Aug 25, 2026
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
4 changes: 4 additions & 0 deletions docker/Dockerfile.humble-base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ RUN /tmp/install_doxygen.sh && rm -f /tmp/install_doxygen.sh
COPY docker/scripts/install_ffmpeg.sh /tmp
RUN /tmp/install_ffmpeg.sh && rm -f /tmp/install_ffmpeg.sh

# Install yq
COPY docker/scripts/install_yq.sh /tmp
RUN /tmp/install_yq.sh && rm -f /tmp/install_yq.sh

# Update ld cache for the installed libraries
RUN /usr/sbin/ldconfig

Expand Down
4 changes: 0 additions & 4 deletions docker/Dockerfile.humble-dev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@ ENV LC_ALL=C.UTF-8
COPY docker/scripts/install_locales.sh /tmp
RUN /tmp/install_locales.sh && rm -f /tmp/install_locales.sh

# Install yq
COPY docker/scripts/install_yq.sh /tmp
RUN /tmp/install_yq.sh && rm -f /tmp/install_yq.sh

# Install mcap
COPY docker/scripts/install_mcap.sh /tmp
RUN /tmp/install_mcap.sh && rm -f /tmp/install_mcap.sh
Expand Down
4 changes: 4 additions & 0 deletions docker/Dockerfile.jazzy-base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ RUN /tmp/install_doxygen.sh && rm -f /tmp/install_doxygen.sh
COPY docker/scripts/install_ffmpeg.sh /tmp
RUN /tmp/install_ffmpeg.sh && rm -f /tmp/install_ffmpeg.sh

# Install yq
COPY docker/scripts/install_yq.sh /tmp
RUN /tmp/install_yq.sh && rm -f /tmp/install_yq.sh

# Update ld cache for the installed libraries
RUN /usr/sbin/ldconfig

Expand Down
4 changes: 0 additions & 4 deletions docker/Dockerfile.jazzy-dev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@ ENV LC_ALL=C.UTF-8
COPY docker/scripts/install_locales.sh /tmp
RUN /tmp/install_locales.sh && rm -f /tmp/install_locales.sh

# Install yq
COPY docker/scripts/install_yq.sh /tmp
RUN /tmp/install_yq.sh && rm -f /tmp/install_yq.sh

# Install mcap
COPY docker/scripts/install_mcap.sh /tmp
RUN /tmp/install_mcap.sh && rm -f /tmp/install_mcap.sh
Expand Down
4 changes: 4 additions & 0 deletions docker/Dockerfile.lyrical-base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ RUN /tmp/install_apt_base.sh && rm -f /tmp/install_apt_base.sh
COPY docker/scripts/install_ffmpeg.sh /tmp
RUN /tmp/install_ffmpeg.sh && rm -f /tmp/install_ffmpeg.sh

# Install yq
COPY docker/scripts/install_yq.sh /tmp
RUN /tmp/install_yq.sh && rm -f /tmp/install_yq.sh

# Update ld cache for the installed libraries
RUN /usr/sbin/ldconfig

Expand Down
4 changes: 0 additions & 4 deletions docker/Dockerfile.lyrical-dev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@ ENV LC_ALL=C.UTF-8
COPY docker/scripts/install_locales.sh /tmp
RUN /tmp/install_locales.sh && rm -f /tmp/install_locales.sh

# Install yq
COPY docker/scripts/install_yq.sh /tmp
RUN /tmp/install_yq.sh && rm -f /tmp/install_yq.sh

# Install mcap
COPY docker/scripts/install_mcap.sh /tmp
RUN /tmp/install_mcap.sh && rm -f /tmp/install_mcap.sh
Expand Down
4 changes: 4 additions & 0 deletions docker/Dockerfile.noetic-base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ RUN /tmp/install_nasm.sh && rm -f /tmp/install_nasm.sh
COPY docker/scripts/install_ffmpeg.sh /tmp
RUN /tmp/install_ffmpeg.sh && rm -f /tmp/install_ffmpeg.sh

# Install yq
COPY docker/scripts/install_yq.sh /tmp
RUN /tmp/install_yq.sh && rm -f /tmp/install_yq.sh

# Download, build and install pre-commit
COPY docker/scripts/install_precommit.sh /tmp
RUN /tmp/install_precommit.sh && rm -f /tmp/install_precommit.sh
Expand Down
4 changes: 0 additions & 4 deletions docker/Dockerfile.noetic-dev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@ ENV LC_ALL=C.UTF-8
COPY docker/scripts/install_locales.sh /tmp
RUN /tmp/install_locales.sh && rm -f /tmp/install_locales.sh

# Install yq
COPY docker/scripts/install_yq.sh /tmp
RUN /tmp/install_yq.sh && rm -f /tmp/install_yq.sh

# Install mcap
COPY docker/scripts/install_mcap.sh /tmp
RUN /tmp/install_mcap.sh && rm -f /tmp/install_mcap.sh
Expand Down
4 changes: 4 additions & 0 deletions docker/Dockerfile.trixie-base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ RUN /tmp/install_doxygen.sh && rm -f /tmp/install_doxygen.sh
COPY docker/scripts/install_ffmpeg.sh /tmp
RUN /tmp/install_ffmpeg.sh && rm -f /tmp/install_ffmpeg.sh

# Install yq
COPY docker/scripts/install_yq.sh /tmp
RUN /tmp/install_yq.sh && rm -f /tmp/install_yq.sh

# Update ld cache for the installed libraries
RUN /usr/sbin/ldconfig

Expand Down
4 changes: 0 additions & 4 deletions docker/Dockerfile.trixie-dev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,6 @@ ENV LC_ALL=C.UTF-8
COPY docker/scripts/install_locales.sh /tmp
RUN /tmp/install_locales.sh && rm -f /tmp/install_locales.sh

# Install yq
COPY docker/scripts/install_yq.sh /tmp
RUN /tmp/install_yq.sh && rm -f /tmp/install_yq.sh

# Install mcap
COPY docker/scripts/install_mcap.sh /tmp
RUN /tmp/install_mcap.sh && rm -f /tmp/install_mcap.sh
Expand Down
7 changes: 4 additions & 3 deletions fpsdk_doc/fpsdk_build.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ namespace fpsdk {

The Fixposition SDK is made for **Linux**. To build it a **GCC** (C++-17) toolchain is required. You may have some
luck using clang, but you're on your own there. Besides a glibc and standard Linux tools, such as CMake, make, bash,
xxd, sed, awk, etc. are required to build. This is tested and known to work with Ubuntu 20.04, 22.04, 24.04/ and
xxd, sed, awk, etc. are required to build. This is tested and known to work with Ubuntu 20.04, 22.04, 24.04 and
26.04, as well as Debian Trixie.

For building the libraries and apps the following dependencies are used. Some are required and some are optional.
Expand Down Expand Up @@ -65,12 +65,13 @@ namespace fpsdk {
`-DFPSDK_USE_PROJ=ON` to required the use of the PROJ library. See also @ref FPSDK_BUILD_BUILD_MANUAL below.

(2) The FFmpeg libraries must be configured with --disable-gpl and --disable-nonfree in order to comply
with the Fixposition SDK license.
with the Fixposition SDK license. The CMake tests for that and refuses to use non-free/gpl builds of the FFmpeg
libraries.

(3) ROS support is optional, and it's either ROS1 *or* ROS2. To enable, build in a ROS environment using catkin
resp. colcon and the availability of ROS is detected automatically.

(4) These are only needed for development. That is, they are not required for building the \@ref FPSDK_COMMON_DOC
(4) These are only needed for development. That is, they are not required for building the @ref FPSDK_COMMON_DOC
and @ref FPSDK_APPS_DOC.

See @ref FPSDK_BUILD_CIVERSIONS for the versions used in the CI builds.
Expand Down
Loading