diff --git a/dockerfiles/devenv.Dockerfile b/dockerfiles/devenv.Dockerfile index 0ba4e4e575da6545620733ded123dbae966cd742..6c119532cdf8557dc5769a4d8c68eeaaaa3bf43d 100644 --- a/dockerfiles/devenv.Dockerfile +++ b/dockerfiles/devenv.Dockerfile @@ -59,11 +59,15 @@ RUN apt-get update && \ RUN apt-get install -y \ python3-pip \ && pip3 install sqlite_utils \ - && pip3 install conan==1.59 \ - && pip3 install transforms3d \ - && conan config set general.revisions_enabled=1 \ - && conan profile new default --detect > /dev/null \ - && conan profile update settings.compiler=gcc default + && pip3 install transforms3d + +# RUN if [ "$ROS_DISTRO" = "noetic" ]; \ +# then \ +# pip3 install conan==1.59 \ +# && conan config set general.revisions_enabled=1 \ +# && conan profile new default --detect > /dev/null \ +# && conan profile update settings.compiler=gcc default; \ +# fi # Install zsh if requested RUN if [ "$EXT_SHELL" = "zsh" ]; \ @@ -119,20 +123,33 @@ COPY /extra_libs/* ./ # Enviroment tools based on ubuntu version RUN if [ -f "common_libs.txt" ]; \ then \ - grep -v '^#' common_libs.txt | xargs dpkg -i ;\ + grep -v '^#' common_libs.txt | xargs wget \ + && dpkg -i *.deb; \ fi +# Workaround for Azure Kinect +# RUN if [ "$ROS_DISTRO" = "noetic" ]; \ +# then \ +# echo 'libk4a1.4 libk4a1.4/accepted-eula-hash string 0f5d5c5de396e4fee4c0753a21fee0c1ed726cf0316204edda484f08cb266d76' | debconf-set-selections \ +# && echo 'libk4abt1.0 libk4abt1.0/accepted-eula-hash string 03a13b63730639eeb6626d24fd45cf25131ee8e8e0df3f1b63f552269b176e38' | debconf-set-selections \ +# && wget https://raw.githubusercontent.com/microsoft/Azure-Kinect-Sensor-SDK/develop/scripts/99-k4a.rules \ +# && mkdir -p udev/rules.d \ +# && mv 99-k4a.rules udev/rules.d/ \ +# && cp --parents udev/rules.d/99-k4a.rules /etc; \ +# fi + # Extra libs, e.g. vtk-7.1_20221201-1_amd64.deb RUN if [ -f "${ROS_DISTRO}_libs.txt" ]; \ then \ - grep -v '^#' ${ROS_DISTRO}_libs.txt | xargs dpkg -i ;\ + grep -v '^#' ${ROS_DISTRO}_libs.txt | xargs wget \ + && dpkg -i *.deb;\ fi RUN rm -rf * RUN apt-get --reinstall install -y libnotify-bin notify-osd # Update this date to re-run the image final update -LABEL image.date=17-11-2023 +LABEL image.date=04-01-2024 # Update final image RUN apt-get update \ @@ -156,4 +173,4 @@ ARG SHELL ENV SHELL "${SHELL}" ENTRYPOINT ["/ros_entrypoint.sh"] -CMD $EXT_SHELL \ No newline at end of file +CMD $EXT_SHELL diff --git a/dockerfiles/extra_libs/common_libs.txt b/dockerfiles/extra_libs/common_libs.txt index 70c87b04839a3f4d494bcbc04f76e0211772880f..966b91187cf74b51bdb75c9f2f02485d6675a7aa 100644 --- a/dockerfiles/extra_libs/common_libs.txt +++ b/dockerfiles/extra_libs/common_libs.txt @@ -1,4 +1,7 @@ # List with the additional libraries to install in devenv image -bat-musl_0.24.0_amd64.deb -lsd-musl_1.0.0_amd64.deb -ripgrep_13.0.0_amd64.deb \ No newline at end of file +# bat-musl +https://github.com/sharkdp/bat/releases/download/v0.24.0/bat-musl_0.24.0_amd64.deb +# lsd-musl +https://github.com/lsd-rs/lsd/releases/download/v1.0.0/lsd-musl_1.0.0_amd64.deb +# ripgrep +https://github.com/BurntSushi/ripgrep/releases/download/14.1.0/ripgrep_14.1.0-1_amd64.deb \ No newline at end of file diff --git a/dockerfiles/extra_libs/melodic_libs.txt b/dockerfiles/extra_libs/melodic_libs.txt index 7e013609f01d2b2f23d14104d23eb89717c41ad7..b048a264c85103ffb912767bcdcac5c9b21fd29b 100644 --- a/dockerfiles/extra_libs/melodic_libs.txt +++ b/dockerfiles/extra_libs/melodic_libs.txt @@ -1,3 +1,5 @@ # Lits of the particualr libs to install in melodic docker image -pcl-1.9.1_20221201-1_amd64.deb -vtk-7.1_20221201-1_amd64.deb \ No newline at end of file +# pcl-1.9.1_20221201-1_amd64.deb +https://git.code.tecnalia.com/andres.montano/docker_libs/-/raw/main/melodic/pcl-1.9.1_20221201-1_amd64.deb?ref_type=heads&inline=false +# vtk-7.1_20221201-1_amd64.deb +https://git.code.tecnalia.com/andres.montano/docker_libs/-/raw/main/melodic/vtk-7.1_20221201-1_amd64.deb?ref_type=heads&inline=false \ No newline at end of file