Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
Development_Environment
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Montaño Sarria, Andres Felipe
Development_Environment
Commits
59770fdf
Commit
59770fdf
authored
1 year ago
by
Montaño Sarria, Andres Felipe
Browse files
Options
Downloads
Patches
Plain Diff
Modified dockerfile to download extra libs instead of put them in sources
parent
19453246
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dockerfiles/devenv.Dockerfile
+26
-9
26 additions, 9 deletions
dockerfiles/devenv.Dockerfile
dockerfiles/extra_libs/common_libs.txt
+6
-3
6 additions, 3 deletions
dockerfiles/extra_libs/common_libs.txt
dockerfiles/extra_libs/melodic_libs.txt
+4
-2
4 additions, 2 deletions
dockerfiles/extra_libs/melodic_libs.txt
with
36 additions
and
14 deletions
dockerfiles/devenv.Dockerfile
+
26
−
9
View file @
59770fdf
...
...
@@ -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-1
1-202
3
LABEL
image.date=
04-0
1-202
4
# 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
This diff is collapsed.
Click to expand it.
dockerfiles/extra_libs/common_libs.txt
+
6
−
3
View file @
59770fdf
# 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
This diff is collapsed.
Click to expand it.
dockerfiles/extra_libs/melodic_libs.txt
+
4
−
2
View file @
59770fdf
# 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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment