Skip to content

no install recommends for all apt calls #82

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
mikaelarguedas merged 3 commits into from
Apr 5, 2020
Merged

no install recommends for all apt calls #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c6c8bd
no install recommends for all apt calls
mikaelarguedas Jan 23, 2020
8941a21
install all bootstrap / build tools in non core image
mikaelarguedas Mar 7, 2020
136c03a
update gazebo images to use no-install-recommends
mikaelarguedas Mar 7, 2020
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
2 changes: 1 addition & 1 deletion docker_templates/templates/docker_images/create_base_image.Dockerfile.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ ENV TZ @timezone
RUN rosdep init

# install requested metapackage
RUN apt-get update && apt-get install -q -y @(' '.join(packages))@
RUN apt-get update && apt-get install -q -y --no-install-recommends @(' '.join(packages))@
Copy link
Copy Markdown
Member

@ruffsl ruffsl Jan 27, 2020

Choose a reason for hiding this comment

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

Was this template always missing the && rm -rf /var/lib/apt/lists/*? Where is this template used again?

Copy link
Copy Markdown
Contributor Author

@mikaelarguedas mikaelarguedas Jan 27, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

It's not used anywhere in docker_images or docker_templates at the moment. But I don't know what it was used for before


ENV ROS_DISTRO @(rosdistro)@
# TODO source rosdistro setup file automatically on entry
Expand Down
2 changes: 1 addition & 1 deletion docker_templates/templates/docker_images/create_gzclient_image.Dockerfile.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
))@
@
# install gazebo packages
RUN apt-get update && apt-get install -q -y \
RUN apt-get update && apt-get install -q -y --no-install-recommends \
@(' \\\n '.join(gazebo_packages))@ \
&& rm -rf /var/lib/apt/lists/*
2 changes: 1 addition & 1 deletion docker_templates/templates/docker_images/create_gzserver_image.Dockerfile.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ RUN . /etc/os-release \
&& echo "deb http://packages.osrfoundation.org/gazebo/$ID-stable `lsb_release -sc` main" > /etc/apt/sources.list.d/gazebo-latest.list

# install gazebo packages
RUN apt-get update && apt-get install -q -y \
RUN apt-get update && apt-get install -q -y --no-install-recommends \
@(' \\\n '.join(gazebo_packages))@ \
&& rm -rf /var/lib/apt/lists/*

Expand Down
2 changes: 1 addition & 1 deletion docker_templates/templates/docker_images/create_gzweb_image.Dockerfile.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ template_dependencies = [
))@
@
# install gazebo packages
RUN apt-get update && apt-get install -q -y \
RUN apt-get update && apt-get install -q -y --no-install-recommends \
@(' \\\n '.join(gazebo_packages))@ \
&& rm -rf /var/lib/apt/lists/*

Expand Down
11 changes: 1 addition & 10 deletions docker_templates/templates/docker_images/create_ros_core_image.Dockerfile.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
base_image=base_image,
maintainer_name=maintainer_name,
))@
@
@(TEMPLATE(
'snippet/old_release_set.Dockerfile.em',
template_packages=template_packages,
Expand Down Expand Up @@ -47,22 +46,14 @@ template_dependencies = [
ros_version=ros_version,
))@

@(TEMPLATE(
'snippet/install_ros_bootstrap_tools.Dockerfile.em',
ros_version=ros_version,
))@

# setup environment
ENV LANG C.UTF-8
ENV LC_ALL C.UTF-8

ENV ROS_DISTRO @rosdistro_name
# bootstrap rosdep
RUN rosdep init && \
rosdep update --rosdistro $ROS_DISTRO

# install ros packages
RUN apt-get update && apt-get install -y \
RUN apt-get update && apt-get install -y --no-install-recommends \
@(' \\\n '.join(ros_packages))@ \
&& rm -rf /var/lib/apt/lists/*

Expand Down
16 changes: 14 additions & 2 deletions docker_templates/templates/docker_images/create_ros_image.Dockerfile.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,29 @@
base_image=base_image,
maintainer_name=maintainer_name,
))@

@(TEMPLATE(
'snippet/install_upstream_package_list.Dockerfile.em',
packages=[],
upstream_packages=upstream_packages if 'upstream_packages' in locals() else [],
))@
@
@[if 'bootstrap_ros_tools' in locals()]@
@(TEMPLATE(
'snippet/install_ros_bootstrap_tools.Dockerfile.em',
ros_version=ros_version,
))@

# bootstrap rosdep
RUN rosdep init && \
rosdep update --rosdistro $ROS_DISTRO

@[end if]@
@
@[if 'ros_packages' in locals()]@
@[ if ros_packages]@

# install ros packages
RUN apt-get update && apt-get install -y \
RUN apt-get update && apt-get install -y --no-install-recommends \
@(' \\\n '.join(ros_packages))@ \
&& rm -rf /var/lib/apt/lists/*

Expand Down
15 changes: 1 addition & 14 deletions docker_templates/templates/docker_images_ros2/create_ros_core_image.Dockerfile.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
base_image=base_image,
maintainer_name=maintainer_name,
))@
@
@(TEMPLATE(
'snippet/old_release_set.Dockerfile.em',
template_packages=template_packages,
Expand Down Expand Up @@ -52,23 +51,11 @@ if 'pip3_install' in locals():
ros_version=ros_version,
))@

@(TEMPLATE(
'snippet/install_ros_bootstrap_tools.Dockerfile.em',
ros_version=ros_version,
))@

# setup environment
ENV LANG C.UTF-8
ENV LC_ALL C.UTF-8

ENV ROS_DISTRO @ros2distro_name
# bootstrap rosdep
RUN rosdep init && \
rosdep update --rosdistro $ROS_DISTRO

@(TEMPLATE(
'snippet/setup_colcon_mixin_metadata.Dockerfile.em',
))@

@[if 'pip3_install' in locals()]@
@[ if pip3_install]@
Expand All @@ -80,7 +67,7 @@ RUN pip3 install -U \
@[end if]@
@
# install ros2 packages
RUN apt-get update && apt-get install -y \
RUN apt-get update && apt-get install -y --no-install-recommends \
@(' \\\n '.join(ros2_packages))@ \
&& rm -rf /var/lib/apt/lists/*

Expand Down
19 changes: 18 additions & 1 deletion docker_templates/templates/docker_images_ros2/create_ros_image.Dockerfile.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
base_image=base_image,
maintainer_name=maintainer_name,
))@

@{
template_dependencies = []
# add 'python3-pip' to 'template_dependencies' if pip dependencies are declared
Expand All @@ -26,6 +27,22 @@ if 'pip3_install' in locals():
upstream_packages=upstream_packages if 'upstream_packages' in locals() else [],
))@
@
@[if 'bootstrap_ros_tools' in locals()]@
@(TEMPLATE(
'snippet/install_ros_bootstrap_tools.Dockerfile.em',
ros_version=ros_version,
))@

# bootstrap rosdep
RUN rosdep init && \
rosdep update --rosdistro $ROS_DISTRO

@(TEMPLATE(
'snippet/setup_colcon_mixin_metadata.Dockerfile.em',
))@

@[end if]@
@
@[if 'pip3_install' in locals()]@
@[ if pip3_install]@
# install python packages
Expand All @@ -37,7 +54,7 @@ RUN pip3 install -U \
@[if 'ros2_packages' in locals()]@
@[ if ros2_packages]@
# install ros2 packages
RUN apt-get update && apt-get install -y \
RUN apt-get update && apt-get install -y --no-install-recommends \
@(' \\\n '.join(ros2_packages))@ \
&& rm -rf /var/lib/apt/lists/*

Expand Down
4 changes: 2 additions & 2 deletions ...lates/templates/docker_images_ros2/ros1_bridge/create_ros_ros1_bridge_image.Dockerfile.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ ENV ROS2_DISTRO @ros2distro_name
@[if 'ros_packages' in locals()]@
@[ if ros_packages]@
# install ros packages
RUN apt-get update && apt-get install -y \
RUN apt-get update && apt-get install -y --no-install-recommends \
@(' \\\n '.join(ros_packages))@ \
&& rm -rf /var/lib/apt/lists/*

Expand All @@ -57,7 +57,7 @@ RUN apt-get update && apt-get install -y \
@[if 'ros2_packages' in locals()]@
@[ if ros2_packages]@
# install ros2 packages
RUN apt-get update && apt-get install -y \
RUN apt-get update && apt-get install -y --no-install-recommends \
@(' \\\n '.join(ros2_packages))@ \
&& rm -rf /var/lib/apt/lists/*

Expand Down
2 changes: 2 additions & 0 deletions docker_templates/templates/snippet/install_ros_bootstrap_tools.Dockerfile.em
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
@{
if int(ros_version) == 2:
package_list = [
'build-essential',
'git',
'python3-colcon-common-extensions',
'python3-colcon-mixin',
Expand All @@ -9,6 +10,7 @@ if int(ros_version) == 2:
]
else:
package_list = [
'build-essential',
'python-rosdep',
'python-rosinstall',
'python-vcstools',
Expand Down
2 changes: 1 addition & 1 deletion docker_templates/templates/snippet/install_upstream_package_list.Dockerfile.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ if isinstance(packages, list):
@[ if packages != []]@

# install packages
RUN apt-get update && apt-get install -q -y \
RUN apt-get update && apt-get install -q -y --no-install-recommends \
@(' \\\n '.join(sorted(packages)))@ \
&& rm -rf /var/lib/apt/lists/*

Expand Down
4 changes: 3 additions & 1 deletion docker_templates/templates/snippet/setup_tzdata.Dockerfile.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,7 @@ releases_with_configured_tzdata = [
# setup timezone
RUN echo 'Etc/UTC' > /etc/timezone && \
ln -s /usr/share/zoneinfo/Etc/UTC /etc/localtime && \
apt-get update && apt-get install -q -y tzdata && rm -rf /var/lib/apt/lists/*
apt-get update && \
apt-get install -q -y --no-install-recommends tzdata && \
rm -rf /var/lib/apt/lists/*
@[end if]@