Skip to content

Improve ROS2 template to match ROS1 #46

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
ruffsl merged 5 commits into from
Dec 29, 2018
Merged

Improve ROS2 template to match ROS1 #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
403d512
Have ros2 images closer conform to ros1 image style
ruffsl Nov 30, 2018
9d2d051
Cleanup whitespace and comment timezone snippet
ruffsl Dec 14, 2018
fcce956
Update ros2 repo url in template
ruffsl Dec 14, 2018
7f08096
Reorginize ros2 templates into separate directory
ruffsl Dec 15, 2018
d41d2fc
Rename ros1 bridge entrypoint for consistancy
ruffsl Dec 24, 2018
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
4 changes: 2 additions & 2 deletions docker_templates/packages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@

indexUrlTemplateLookup = {
'gazebo_packages': string.Template('http://packages.osrfoundation.org/gazebo/$os_name-$release/dists/$os_code_name/main/binary-$arch/Packages'),
'ros_packages': string.Template('http://packages.ros.org/$release/ubuntu/dists/$os_code_name/main/binary-$arch/Packages'),
'ros2_packages': string.Template('http://repo.ros2.org/$os_name/main/dists/$os_code_name/main/binary-$arch/Packages'),
'ros_packages': string.Template('http://packages.ros.org/ros/ubuntu/dists/$os_code_name/main/binary-$arch/Packages'),
'ros2_packages': string.Template('http://packages.ros.org/ros2/ubuntu/dists/$os_code_name/main/binary-$arch/Packages'),
}

packageNameVersionTemplateLookup = {
Expand Down
21 changes: 13 additions & 8 deletions ...ages/create_ros2_core_image.Dockerfile.em → ..._ros2/create_ros_core_image.Dockerfile.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,27 @@ if 'pip3_install' in locals():
upstream_packages=upstream_packages if 'upstream_packages' in locals() else [],
))@
@

# setup ros2 keys
RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 421C365BD9FF1F717815A3895523BAEEB01FA116

# setup sources.list
RUN . /etc/os-release \
&& echo "deb http://repo.ros2.org/$ID/main `lsb_release -sc` main" > /etc/apt/sources.list.d/ros2-latest.list
RUN echo "deb http://packages.ros.org/ros2/ubuntu `lsb_release -sc` main" > /etc/apt/sources.list.d/ros2-latest.list

# install bootstrap tools
RUN apt-get update && apt-get install --no-install-recommends -y \
python3-rosdep \
python3-rosinstall \
python3-vcstools \
&& rm -rf /var/lib/apt/lists/*

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

ENV ROS_DISTRO @ros2distro_name
# bootstrap rosdep
ENV ROSDISTRO_INDEX_URL https://raw.githubusercontent.com/ros2/rosdistro/ros2/index.yaml
RUN rosdep init \
&& rosdep update

@[if 'pip3_install' in locals()]@
@[ if pip3_install]@
Expand All @@ -58,15 +66,12 @@ RUN pip3 install -U \
@[ end if]@
@[end if]@

@[if 'ros2_packages' in locals()]@
@[ if ros2_packages]@
# install ros2 packages
ENV ROS_DISTRO @ros2distro_name
RUN apt-get update && apt-get install -y \
@(' \\\n '.join(ros2_packages))@ \
&& rm -rf /var/lib/apt/lists/*

@[ end if]@
@[end if]@
@[if 'entrypoint_name' in locals()]@
@[ if entrypoint_name]@
@{
Expand Down
0 ...er_images/create_ros2_image.Dockerfile.em → ...mages_ros2/create_ros_image.Dockerfile.em
View file
Open in desktop
File renamed without changes.
3 changes: 1 addition & 2 deletions ...es/create_ros2_source_image.Dockerfile.em → ...os2/create_ros_source_image.Dockerfile.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ if 'pip3_install' in locals():
RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 421C365BD9FF1F717815A3895523BAEEB01FA116

# setup sources.list
RUN . /etc/os-release \
&& echo "deb http://repo.ros2.org/$ID/main `lsb_release -sc` main" > /etc/apt/sources.list.d/ros2-latest.list
RUN echo "deb http://packages.ros.org/ros2/ubuntu `lsb_release -sc` main" > /etc/apt/sources.list.d/ros2-latest.list

# setup environment
ENV LANG C.UTF-8
Expand Down
0 ...eate_ros2_ros1_bridge_image.Dockerfile.em → ...reate_ros_ros1_bridge_image.Dockerfile.em
View file
Open in desktop
File renamed without changes.
0 ...s/docker_images/ros1_bridge_entrypoint.sh → ...images_ros2/ros1_bridge/ros_entrypoint.sh
View file
Open in desktop
File renamed without changes.
0 ...emplates/docker_images/ros2_entrypoint.sh → ...ates/docker_images_ros2/ros_entrypoint.sh
View file
Open in desktop
File renamed without changes.
0 ...s/docker_images/ros2_source_entrypoint.sh → ...cker_images_ros2/ros_source_entrypoint.sh
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 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 @@ -20,8 +20,8 @@ releases_with_configured_tzdata = [
}@
@[if os_name == 'ubuntu' and os_code_name not in 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/*

@[end if]@