Skip to content
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

Move ros1-bridge images to the official docker library #415

Merged
merged 2 commits into from
Jun 5, 2020
Merged

Move ros1-bridge images to the official docker library #415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c71d717
move ros1-bridge from the osrf profile to the official library
mikaelarguedas Jun 3, 2020
7e7076d
update docker library
mikaelarguedas Jun 5, 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
6 changes: 3 additions & 3 deletions ros/.config/ros2/Makefile.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ help:
build:
@docker build --tag=ros:$release_name-ros-core-$os_code_name ros-core/.
@docker build --tag=ros:$release_name-ros-base-$os_code_name ros-base/.
@docker build --tag=ros:$release_name-ros1-bridge-$os_code_name ros1-bridge/.
# @docker build --tag=osrf/ros:$release_name-desktop-$os_code_name desktop/.
# @docker build --tag=osrf/ros:$release_name-ros1-bridge-$os_code_name ros1-bridge/.

pull:
@docker pull ros:$release_name-ros-core-$os_code_name
@docker pull ros:$release_name-ros-base-$os_code_name
@docker pull ros:$release_name-ros1-bridge-$os_code_name
# @docker pull osrf/ros:$release_name-desktop-$os_code_name
# @docker pull osrf/ros:$release_name-ros1-bridge-$os_code_name

clean:
@docker rmi -f ros:$release_name-ros-core-$os_code_name
@docker rmi -f ros:$release_name-ros-base-$os_code_name
@docker rmi -f ros:$release_name-ros1-bridge-$os_code_name
# @docker rmi -f osrf/ros:$release_name-desktop-$os_code_name
# @docker rmi -f osrf/ros:$release_name-ros1-bridge-$os_code_name
6 changes: 3 additions & 3 deletions ros/dashing/ubuntu/bionic/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ help:
build:
@docker build --tag=ros:dashing-ros-core-bionic ros-core/.
@docker build --tag=ros:dashing-ros-base-bionic ros-base/.
@docker build --tag=ros:dashing-ros1-bridge-bionic ros1-bridge/.
# @docker build --tag=osrf/ros:dashing-desktop-bionic desktop/.
# @docker build --tag=osrf/ros:dashing-ros1-bridge-bionic ros1-bridge/.

pull:
@docker pull ros:dashing-ros-core-bionic
@docker pull ros:dashing-ros-base-bionic
@docker pull ros:dashing-ros1-bridge-bionic
# @docker pull osrf/ros:dashing-desktop-bionic
# @docker pull osrf/ros:dashing-ros1-bridge-bionic

clean:
@docker rmi -f ros:dashing-ros-core-bionic
@docker rmi -f ros:dashing-ros-base-bionic
@docker rmi -f ros:dashing-ros1-bridge-bionic
# @docker rmi -f osrf/ros:dashing-desktop-bionic
# @docker rmi -f osrf/ros:dashing-ros1-bridge-bionic
7 changes: 7 additions & 0 deletions ros/dashing/ubuntu/bionic/images.yaml.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,10 @@ images:
- ros-comm
- roscpp-tutorials
- rospy-tutorials
downstream_packages:
# The Python 3 version of rosdep get uninstalled when installign ROS 1
# We install the Python 2 version manually to not conflict and allow consumers to use the CLI tool
- python-rosdep
# Currently not side-by-side installable with python2 version
# https://github.com/ros-infrastructure/rosdep/issues/759
# - python3-rosdep-modules
5 changes: 5 additions & 0 deletions ros/dashing/ubuntu/bionic/ros1-bridge/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
ros-dashing-demo-nodes-py=0.7.9-1* \
&& rm -rf /var/lib/apt/lists/*

# install downstream packages
RUN apt-get update && apt-get install -y --no-install-recommends \
python-rosdep \
&& rm -rf /var/lib/apt/lists/*

# setup entrypoint
COPY ./ros_entrypoint.sh /

14 changes: 0 additions & 14 deletions ros/dashing/ubuntu/bionic/ros1-bridge/hooks/post_push
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions ros/eloquent/ubuntu/bionic/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ help:
build:
@docker build --tag=ros:eloquent-ros-core-bionic ros-core/.
@docker build --tag=ros:eloquent-ros-base-bionic ros-base/.
@docker build --tag=ros:eloquent-ros1-bridge-bionic ros1-bridge/.
# @docker build --tag=osrf/ros:eloquent-desktop-bionic desktop/.
# @docker build --tag=osrf/ros:eloquent-ros1-bridge-bionic ros1-bridge/.

pull:
@docker pull ros:eloquent-ros-core-bionic
@docker pull ros:eloquent-ros-base-bionic
@docker pull ros:eloquent-ros1-bridge-bionic
# @docker pull osrf/ros:eloquent-desktop-bionic
# @docker pull osrf/ros:eloquent-ros1-bridge-bionic

clean:
@docker rmi -f ros:eloquent-ros-core-bionic
@docker rmi -f ros:eloquent-ros-base-bionic
@docker rmi -f ros:eloquent-ros1-bridge-bionic
# @docker rmi -f osrf/ros:eloquent-desktop-bionic
# @docker rmi -f osrf/ros:eloquent-ros1-bridge-bionic
7 changes: 7 additions & 0 deletions ros/eloquent/ubuntu/bionic/images.yaml.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,10 @@ images:
- ros-comm
- roscpp-tutorials
- rospy-tutorials
downstream_packages:
# The Python 3 version of rosdep get uninstalled when installign ROS 1
# We install the Python 2 version manually to not conflict and allow consumers to use the CLI tool
- python-rosdep
# Currently not side-by-side installable with python2 version
# https://github.com/ros-infrastructure/rosdep/issues/759
# - python3-rosdep-modules
5 changes: 5 additions & 0 deletions ros/eloquent/ubuntu/bionic/ros1-bridge/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
ros-eloquent-demo-nodes-py=0.8.4-1* \
&& rm -rf /var/lib/apt/lists/*

# install downstream packages
RUN apt-get update && apt-get install -y --no-install-recommends \
python-rosdep \
&& rm -rf /var/lib/apt/lists/*

# setup entrypoint
COPY ./ros_entrypoint.sh /

14 changes: 0 additions & 14 deletions ros/eloquent/ubuntu/bionic/ros1-bridge/hooks/post_push
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions ros/foxy/ubuntu/focal/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ help:
build:
@docker build --tag=ros:foxy-ros-core-focal ros-core/.
@docker build --tag=ros:foxy-ros-base-focal ros-base/.
@docker build --tag=ros:foxy-ros1-bridge-focal ros1-bridge/.
# @docker build --tag=osrf/ros:foxy-desktop-focal desktop/.
# @docker build --tag=osrf/ros:foxy-ros1-bridge-focal ros1-bridge/.

pull:
@docker pull ros:foxy-ros-core-focal
@docker pull ros:foxy-ros-base-focal
@docker pull ros:foxy-ros1-bridge-focal
# @docker pull osrf/ros:foxy-desktop-focal
# @docker pull osrf/ros:foxy-ros1-bridge-focal

clean:
@docker rmi -f ros:foxy-ros-core-focal
@docker rmi -f ros:foxy-ros-base-focal
@docker rmi -f ros:foxy-ros1-bridge-focal
# @docker rmi -f osrf/ros:foxy-desktop-focal
# @docker rmi -f osrf/ros:foxy-ros1-bridge-focal
14 changes: 0 additions & 14 deletions ros/foxy/ubuntu/focal/ros1-bridge/hooks/post_push
View file
Open in desktop

This file was deleted.

18 changes: 12 additions & 6 deletions ros/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,10 @@ release_names:
- "$release_name-ros-base"
- "$release_name-ros-base-$os_code_name"
- "$release_name"
ros1-bridge:
aliases:
- "$release_name-ros1-bridge"
- "$release_name-ros1-bridge-$os_code_name"
eloquent:
eol: 2020-11
os_names:
Expand All @@ -485,6 +489,10 @@ release_names:
- "$release_name-ros-base"
- "$release_name-ros-base-$os_code_name"
- "$release_name"
ros1-bridge:
aliases:
- "$release_name-ros1-bridge"
- "$release_name-ros1-bridge-$os_code_name"
foxy:
eol: 2025-05
os_names:
Expand All @@ -507,6 +515,10 @@ release_names:
- "$release_name-ros-base-$os_code_name"
- "$release_name"
- latest
ros1-bridge:
aliases:
- "$release_name-ros1-bridge"
- "$release_name-ros1-bridge-$os_code_name"
meta:
maintainers:
- Tully Foote <tfoote+buildfarm@osrfoundation.org> (@tfoote)
Expand Down Expand Up @@ -677,8 +689,6 @@ hacks:
tag_names:
desktop:
<<: *DEFAULT_HOOKS
ros1-bridge:
<<: *DEFAULT_HOOKS
eloquent:
os_names:
ubuntu:
Expand All @@ -687,8 +697,6 @@ hacks:
tag_names:
desktop:
<<: *DEFAULT_HOOKS
ros1-bridge:
<<: *DEFAULT_HOOKS
foxy:
os_names:
ubuntu:
Expand All @@ -697,5 +705,3 @@ hacks:
tag_names:
desktop:
<<: *DEFAULT_HOOKS
ros1-bridge:
<<: *DEFAULT_HOOKS
15 changes: 15 additions & 0 deletions ros/ros
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,11 @@ Architectures: amd64, arm32v7, arm64v8
GitCommit: 0b33e61b5bbed5b93b9fba2d5bae5db604ff9b58
Directory: ros/dashing/ubuntu/bionic/ros-base

Tags: dashing-ros1-bridge, dashing-ros1-bridge-bionic
Architectures: amd64, arm32v7, arm64v8
GitCommit: c71d7177eaad534e42307b4e7ab7e30078c884de
Directory: ros/dashing/ubuntu/bionic/ros1-bridge


################################################################################
# Release: eloquent
Expand All @@ -161,6 +166,11 @@ Architectures: amd64, arm32v7, arm64v8
GitCommit: 0b33e61b5bbed5b93b9fba2d5bae5db604ff9b58
Directory: ros/eloquent/ubuntu/bionic/ros-base

Tags: eloquent-ros1-bridge, eloquent-ros1-bridge-bionic
Architectures: amd64, arm32v7, arm64v8
GitCommit: c71d7177eaad534e42307b4e7ab7e30078c884de
Directory: ros/eloquent/ubuntu/bionic/ros1-bridge


################################################################################
# Release: foxy
Expand All @@ -178,3 +188,8 @@ Architectures: amd64, arm64v8
GitCommit: 03c81bdfa9d3b185ac009d9a8ecea26ccd85e179
Directory: ros/foxy/ubuntu/focal/ros-base

Tags: foxy-ros1-bridge, foxy-ros1-bridge-focal
Architectures: amd64, arm64v8
GitCommit: c71d7177eaad534e42307b4e7ab7e30078c884de
Directory: ros/foxy/ubuntu/focal/ros1-bridge