Skip to content

Commit

Permalink
Update makefiles and template
Browse files Browse the repository at this point in the history
  • Loading branch information
@ruffsl
ruffsl committed Dec 29, 2018
1 parent 8146855 commit bb07e11
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 48 deletions.
24 changes: 12 additions & 12 deletions ros/.config/ros2/Makefile.em
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ help:
@echo ""

build:
@docker build --tag=osrf/ros2:$release_name-ros-core-$os_code_name ros-core/.
@docker build --tag=osrf/ros2:$release_name-ros-base-$os_code_name ros-base/.
@docker build --tag=osrf/ros2:$release_name-desktop-$os_code_name desktop/.
@docker build --tag=osrf/ros2:$release_name-ros1-bridge-$os_code_name ros1-bridge/.
@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=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 osrf/ros2:$release_name-ros-core-$os_code_name
@docker pull osrf/ros2:$release_name-ros-base-$os_code_name
@docker pull osrf/ros2:$release_name-desktop-$os_code_name
@docker pull osrf/ros2:$release_name-ros1-bridge-$os_code_name
@docker pull ros:$release_name-ros-core-$os_code_name
@docker pull ros:$release_name-ros-base-$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 osrf/ros2:$release_name-ros-core-$os_code_name
@docker rmi -f osrf/ros2:$release_name-ros-base-$os_code_name
@docker rmi -f osrf/ros2:$release_name-desktop-$os_code_name
@docker rmi -f osrf/ros2:$release_name-ros1-bridge-$os_code_name
@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 osrf/ros:$release_name-desktop-$os_code_name
# @docker rmi -f osrf/ros:$release_name-ros1-bridge-$os_code_name
24 changes: 12 additions & 12 deletions ros/ardent/ubuntu/xenial/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ help:
@echo ""

build:
@docker build --tag=osrf/ros2:ardent-ros-core-xenial ros-core/.
@docker build --tag=osrf/ros2:ardent-ros-base-xenial ros-base/.
@docker build --tag=osrf/ros2:ardent-desktop-xenial desktop/.
@docker build --tag=osrf/ros2:ardent-ros1-bridge-xenial ros1-bridge/.
@docker build --tag=ros:ardent-ros-core-xenial ros-core/.
@docker build --tag=ros:ardent-ros-base-xenial ros-base/.
# @docker build --tag=osrf/ros:ardent-desktop-xenial desktop/.
# @docker build --tag=osrf/ros:ardent-ros1-bridge-xenial ros1-bridge/.

pull:
@docker pull osrf/ros2:ardent-ros-core-xenial
@docker pull osrf/ros2:ardent-ros-base-xenial
@docker pull osrf/ros2:ardent-desktop-xenial
@docker pull osrf/ros2:ardent-ros1-bridge-xenial
@docker pull ros:ardent-ros-core-xenial
@docker pull ros:ardent-ros-base-xenial
# @docker pull osrf/ros:ardent-desktop-xenial
# @docker pull osrf/ros:ardent-ros1-bridge-xenial

clean:
@docker rmi -f osrf/ros2:ardent-ros-core-xenial
@docker rmi -f osrf/ros2:ardent-ros-base-xenial
@docker rmi -f osrf/ros2:ardent-desktop-xenial
@docker rmi -f osrf/ros2:ardent-ros1-bridge-xenial
@docker rmi -f ros:ardent-ros-core-xenial
@docker rmi -f ros:ardent-ros-base-xenial
# @docker rmi -f osrf/ros:ardent-desktop-xenial
# @docker rmi -f osrf/ros:ardent-ros1-bridge-xenial
24 changes: 12 additions & 12 deletions ros/bouncy/ubuntu/bionic/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ help:
@echo ""

build:
@docker build --tag=osrf/ros2:bouncy-ros-core-bionic ros-core/.
@docker build --tag=osrf/ros2:bouncy-ros-base-bionic ros-base/.
@docker build --tag=osrf/ros2:bouncy-desktop-bionic desktop/.
@docker build --tag=osrf/ros2:bouncy-ros1-bridge-bionic ros1-bridge/.
@docker build --tag=ros:bouncy-ros-core-bionic ros-core/.
@docker build --tag=ros:bouncy-ros-base-bionic ros-base/.
# @docker build --tag=osrf/ros:bouncy-desktop-bionic desktop/.
# @docker build --tag=osrf/ros:bouncy-ros1-bridge-bionic ros1-bridge/.

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

clean:
@docker rmi -f osrf/ros2:bouncy-ros-core-bionic
@docker rmi -f osrf/ros2:bouncy-ros-base-bionic
@docker rmi -f osrf/ros2:bouncy-desktop-bionic
@docker rmi -f osrf/ros2:bouncy-ros1-bridge-bionic
@docker rmi -f ros:bouncy-ros-core-bionic
@docker rmi -f ros:bouncy-ros-base-bionic
# @docker rmi -f osrf/ros:bouncy-desktop-bionic
# @docker rmi -f osrf/ros:bouncy-ros1-bridge-bionic
24 changes: 12 additions & 12 deletions ros/crystal/ubuntu/bionic/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ help:
@echo ""

build:
@docker build --tag=osrf/ros2:crystal-ros-core-bionic ros-core/.
@docker build --tag=osrf/ros2:crystal-ros-base-bionic ros-base/.
@docker build --tag=osrf/ros2:crystal-desktop-bionic desktop/.
@docker build --tag=osrf/ros2:crystal-ros1-bridge-bionic ros1-bridge/.
@docker build --tag=ros:crystal-ros-core-bionic ros-core/.
@docker build --tag=ros:crystal-ros-base-bionic ros-base/.
# @docker build --tag=osrf/ros:crystal-desktop-bionic desktop/.
# @docker build --tag=osrf/ros:crystal-ros1-bridge-bionic ros1-bridge/.

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

clean:
@docker rmi -f osrf/ros2:crystal-ros-core-bionic
@docker rmi -f osrf/ros2:crystal-ros-base-bionic
@docker rmi -f osrf/ros2:crystal-desktop-bionic
@docker rmi -f osrf/ros2:crystal-ros1-bridge-bionic
@docker rmi -f ros:crystal-ros-core-bionic
@docker rmi -f ros:crystal-ros-base-bionic
# @docker rmi -f osrf/ros:crystal-desktop-bionic
# @docker rmi -f osrf/ros:crystal-ros1-bridge-bionic

0 comments on commit bb07e11

Please sign in to comment.