From fed5e13ca76781812e4a7fd58154270f3b9aeb39 Mon Sep 17 00:00:00 2001
From: Andres Montano <andres.montano@tecnalia.com>
Date: Sun, 27 Oct 2024 13:12:08 +0100
Subject: [PATCH] Update dockerfile with peakBasic update
---
ToDo.md | 4 ++++
dockerfiles/devenv.Dockerfile | 5 +++--
2 files changed, 7 insertions(+), 2 deletions(-)
create mode 100644 ToDo.md
diff --git a/ToDo.md b/ToDo.md
new file mode 100644
index 0000000..36c5793
--- /dev/null
+++ b/ToDo.md
@@ -0,0 +1,4 @@
+- continue with rocker extensions to avoid Dockerfile issues
+- Documentation for templates inspired by [VSCode ROS2 Workspace Template](https://github.com/athackst/vscode_ros2_workspace/tree/humble)
+- CI/CD
+- Artifactory how to load images
\ No newline at end of file
diff --git a/dockerfiles/devenv.Dockerfile b/dockerfiles/devenv.Dockerfile
index 5faab12..cbbbf15 100644
--- a/dockerfiles/devenv.Dockerfile
+++ b/dockerfiles/devenv.Dockerfile
@@ -29,7 +29,7 @@ RUN apt-get update && \
bat \
ca-certificates \
checkinstall \
- clang-format clang-tidy clang-tools clang \
+ clang-format clang-tidy clang-tools clang clangd\
cmake-curses-gui \
curl \
dbus-x11 \
@@ -129,13 +129,14 @@ RUN if [ "$PEAK_DRIVER" = "install" ]; \
then \
apt-get update && apt-get install -y udev libpopt-dev linux-headers-$(uname -r) \
&& wget https://www.peak-system.com/fileadmin/media/linux/files/peak-linux-driver-8.18.0.tar.gz \
+ # && wget https://www.peak-system.com/quick/PEAK-Linux-Driver -O peak-linux-driver.tar.gz \
&& wget https://www.peak-system.com/quick/BasicLinux -O PCAN-Basic_Linux.tar.gz \
&& tar -xvf peak-linux-driver-8.18.0.tar.gz \
&& cd peak-linux-driver-8.18.0 \
&& make clean && make install || echo 'make failed but move forward'\
&& cd .. \
&& tar -xvf PCAN-Basic_Linux.tar.gz \
- && cd PCAN-Basic_Linux-4.8.0.5/libpcanbasic \
+ && cd PCAN-Basic_Linux-4.9.0.7/libpcanbasic \
&& make clean && make install || echo 'make failed but move forward';\
fi
--
GitLab