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.

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

Jump to bottom

Updated Micro epsilon SDK and dependencies #32

Merged
merged 6 commits into from
Nov 24, 2023
Merged

Updated Micro epsilon SDK and dependencies #32

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
879f435
Updated Micro epsilon SDK and dependencies
NithishkumarS Nov 21, 2023
af3e168
Code review fixes
NithishkumarS Nov 22, 2023
56f064f
Removed redundant dependencies
NithishkumarS Nov 23, 2023
8bcd331
Update CI to use noetic
dave992 Nov 23, 2023
a781687
Add missing libusb dependency to aravis .deb
dave992 Nov 24, 2023
7f09b0f
Update min aravis version
dave992 Nov 24, 2023
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
39 changes: 25 additions & 14 deletions .docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,31 @@ ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update && \
apt-get install -y --no-install-recommends \
checkinstall \
cmake \
debhelper \
g++ \
gcc \
gettext \
git \
gobject-introspection \
gtk-doc-tools \
intltool \
libgirepository1.0-dev \
libglib2.0-dev \
libgstreamer1.0-dev \
libgstreamer-plugins-base1.0-dev \
libgstreamer-plugins-good1.0-dev \
libgtk-3-dev \
libusb-1.0-0-dev \
libxml2-dev \
python3-pip \
ninja-build \
pkg-config \
unzip \
wget \
libxml2-dev libglib2.0-dev cmake libusb-1.0-0-dev gobject-introspection \
libgtk-3-dev gtk-doc-tools xsltproc libgstreamer1.0-dev \
libgstreamer-plugins-base1.0-dev libgstreamer-plugins-good1.0-dev \
libgirepository1.0-dev gettext \
&& rm -rf /var/lib/apt/lists/*

RUN pip3 install meson
xsltproc \
&& rm -rf /var/lib/apt/lists/* && \
Copy link

@katettudelft katettudelft Nov 28, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd suggest expanding this a bit further - this is the standard 'clean-up' stanza I use with each apt call:

apt-get autoremove -y &&\
apt-get clean -y &&\
rm -rf /var/lib/apt/lists/*

pip3 install meson

RUN wget https://github.com/AravisProject/aravis/releases/download/0.8.30/aravis-0.8.30.tar.xz -O aravis-0.8.30.tar.xz &&\
tar xfJ aravis-0.8.30.tar.xz && \
Expand All @@ -33,7 +41,7 @@ RUN wget https://github.com/AravisProject/aravis/releases/download/0.8.30/aravis
meson setup build && \
cd build && \
ninja && \
checkinstall --pkgname aravis --pkgversion 0.8.30 ninja install
checkinstall --pkgname aravis --pkgversion 0.8.30 --requires="libglib2.0-dev, libxml2-dev" ninja install
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just curious why we 'bother' with checkinstall if this is a Dockerfile?


SHELL ["/bin/bash", "-c"]
RUN wget https://software.micro-epsilon.com/scanCONTROL-Linux-SDK-${SCANCONTROL_SDK_VERSION//./-}.zip -O scanCONTROL-Linux-SDK-${SCANCONTROL_SDK_VERSION//./-}.zip && \
Expand All @@ -43,13 +51,13 @@ RUN wget https://software.micro-epsilon.com/scanCONTROL-Linux-SDK-${SCANCONTROL_
meson builddir && \
cd builddir && \
ninja && \
checkinstall --pkgname mescan --pkgversion ${SCANCONTROL_SDK_VERSION} --requires="aravis \(\>= 0.6.0\)" ninja install && \
checkinstall --pkgname mescan --pkgversion ${SCANCONTROL_SDK_VERSION} --requires="aravis \(\>= 0.8.0\)" ninja install && \
ldconfig && \
cd ../../libllt && \
cd /scanCONTROL-Linux-SDK/libllt && \
meson builddir && \
cd builddir && \
ninja && \
checkinstall --pkgname llt --pkgversion ${SCANCONTROL_SDK_VERSION} --requires="mescan \(\>= ${SCANCONTROL_SDK_VERSION}\),aravis \(\>= 0.6.0\)" ninja install
checkinstall --pkgname llt --pkgversion ${SCANCONTROL_SDK_VERSION} --requires="mescan \(\>= ${SCANCONTROL_SDK_VERSION}\),aravis \(\>= 0.8.0\)" ninja install

RUN mkdir /library_pkgs && \
mv /aravis-0.8.30/build/aravis_0.8.30-1_amd64.deb /library_pkgs && \
Expand All @@ -59,9 +67,10 @@ RUN mkdir /library_pkgs && \
FROM ros:noetic-ros-core
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd recommend that you add an AS label for FROM statements. It breaks the file up a bit conceptually, and makes multi-target builds an option (if we want to use them later).

There's an example on line 3.

ARG SCANCONTROL_SDK_VERSION

RUN apt-get update && \
apt-get install -y \
RUN apt-get update && apt-get install -y --no-install-recommends\
intltool \
libglib2.0-dev \
libusb-1.0-0-dev \
NithishkumarS marked this conversation as resolved.
Show resolved Hide resolved
pkg-config \
&& rm -rf /var/lib/apt/lists/*

Expand All @@ -70,4 +79,6 @@ COPY --from=build ["/library_pkgs", "/library_pkgs"]
RUN apt-get update && \
apt install -y /library_pkgs/aravis_0.8.30-1_amd64.deb && \
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's preferable to use apt-get rather than apt in scripts - it has a more reliable command line interface.

I think you can do all of the packages in one install command too (but please test it works if you change it).

Finally, if these are the only files in /library_pkgs/, then you could consider using
apt-get install /library_pkgs/* to make the command shorter. Obviously if there are additional files in there that you don't want, or the contents are subject to change, then don't do this. :)

apt install /library_pkgs/mescan_${SCANCONTROL_SDK_VERSION}-1_amd64.deb && \
apt install /library_pkgs/llt_${SCANCONTROL_SDK_VERSION}-1_amd64.deb
apt install /library_pkgs/llt_${SCANCONTROL_SDK_VERSION}-1_amd64.deb \
&& rm -rf /var/lib/apt/lists/*

Loading