-
Notifications
You must be signed in to change notification settings - Fork 183
[ROS] Crystal #206
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.
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
Merged
[ROS] Crystal #206
Changes from all commits
Commits
Show all changes
35 commits
Select commit
Hold shift + click to select a range
a2a3be4
Template over os_code_name to facilitate multi os
ruffsl 0bf8042
Add support for arm64v8
ruffsl 70c14bd
Update manifest for arm64v8
ruffsl 14af668
Enable version pinning
ruffsl a78adf2
Add hooks
ruffsl e7685ee
Update manifest
ruffsl a1ca2a9
Add preliminary files for ros2 crystal
ruffsl 4d7a97b
Update README on ROS2 links
ruffsl 2d46186
Downplay SROS1 images to bolster SROS2 migration
ruffsl 29cd64a
Update EOL date for Crystal
ruffsl 610d353
Update template to include bootstrap tools
ruffsl 68f99cf
Update using cleaned template and versions
ruffsl 67a754e
Update manefest
ruffsl 1e3e24d
Update ros2 repo url in dockerfile
ruffsl b551a7e
Update manifest
ruffsl df63960
Remove desktop and bridge image from manifest
ruffsl 271eb1c
Using ros as repo name for docker images
ruffsl fd8d22d
Update dockerfiles
ruffsl 2e04cb4
Update manifest
ruffsl aa4f59e
Update master template to use same entrypoint name
ruffsl c5a4ec1
Update Dockerfiles to use same entrypoint name
ruffsl a18c67b
Update manifest
ruffsl b6291e8
Merge versions into offical ros repo
ruffsl 68305a0
Move ros2 files into common ros difrecotry
ruffsl eaca344
Update comment in template
ruffsl 66b46b1
Merge ros2 config into common ros directory
ruffsl a59739f
Update desktop and ros1 bridge images
ruffsl aea6878
Rename ros1 bridge entrypoint name for consistency
ruffsl ad31efa
Update common manefest to include ros2 images
ruffsl e747935
Remove remaining file from old ros2 folder
ruffsl 8146855
Update travis CI for ros2 merge
ruffsl bb07e11
Update makefiles and template
ruffsl 9619e8b
Fix Dockerfiles to build from tags including os_code_name
ruffsl d5241ac
Update manifest
ruffsl 56c98f7
Restructure ros2 source templates
ruffsl File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| all: help | ||
|
|
||
| help: | ||
| @echo "" | ||
| @echo "-- Help Menu" | ||
| @echo "" | ||
| @echo " 1. make build - build all images" | ||
| @echo " 2. make pull - pull all images" | ||
| @echo " 3. make clean - remove all images" | ||
| @echo "" | ||
|
|
||
| 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=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 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 osrf/ros:$release_name-desktop-$os_code_name | ||
| # @docker rmi -f osrf/ros:$release_name-ros1-bridge-$os_code_name |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| all: help | ||
|
|
||
| help: | ||
| @echo "" | ||
| @echo "-- Help Menu" | ||
| @echo "" | ||
| @echo " 1. make build - build all images" | ||
| @echo " 2. make pull - pull all images" | ||
| @echo " 3. make clean - remove all images" | ||
| @echo "" | ||
|
|
||
| build: | ||
| @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 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 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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| # This is an auto generated Dockerfile for ros:desktop | ||
| # generated from docker_images_ros2/create_ros_image.Dockerfile.em | ||
| FROM ros:ardent-ros-base-xenial | ||
| # install ros2 packages | ||
| RUN apt-get update && apt-get install -y \ | ||
| ros-ardent-desktop=0.4.0-1* \ | ||
| && rm -rf /var/lib/apt/lists/* | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| #!/bin/bash | ||
| # http://windsock.io/automated-docker-image-builds-with-multiple-tags/ | ||
|
|
||
| set -e | ||
|
|
||
| # Parse image name for repo name | ||
| tagStart=$(expr index "$IMAGE_NAME" :) | ||
| repoName=${IMAGE_NAME:0:tagStart-1} | ||
|
|
||
| # Tag and push image for each additional tag | ||
| for tag in ardent-desktop; do | ||
| docker tag $IMAGE_NAME ${repoName}:${tag} | ||
| docker push ${repoName}:${tag} | ||
| done |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| # This is an auto generated Dockerfile for ros:ros-base | ||
| # generated from docker_images_ros2/create_ros_image.Dockerfile.em | ||
| FROM ros:ardent-ros-core-xenial | ||
| # install ros2 packages | ||
| RUN apt-get update && apt-get install -y \ | ||
| ros-ardent-ros-base=0.4.0-1* \ | ||
| && rm -rf /var/lib/apt/lists/* | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| # This is an auto generated Dockerfile for ros:ros-core | ||
| # generated from docker_images_ros2/create_ros_core_image.Dockerfile.em | ||
| FROM ubuntu:xenial | ||
|
|
||
| # install packages | ||
| RUN apt-get update && apt-get install -q -y \ | ||
| dirmngr \ | ||
| gnupg2 \ | ||
| lsb-release \ | ||
| python3-pip \ | ||
| && rm -rf /var/lib/apt/lists/* | ||
|
|
||
| # setup ros2 keys | ||
| RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 421C365BD9FF1F717815A3895523BAEEB01FA116 | ||
|
|
||
| # setup sources.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 | ||
|
|
||
| # bootstrap rosdep | ||
| ENV ROSDISTRO_INDEX_URL https://raw.githubusercontent.com/ros2/rosdistro/ros2/index.yaml | ||
| RUN rosdep init \ | ||
| && rosdep update | ||
|
|
||
| # install python packages | ||
| RUN pip3 install -U \ | ||
| argcomplete | ||
|
|
||
| # install ros2 packages | ||
| ENV ROS_DISTRO ardent | ||
| RUN apt-get update && apt-get install -y \ | ||
| ros-ardent-ros-core=0.4.0-1* \ | ||
| && rm -rf /var/lib/apt/lists/* | ||
|
|
||
| # setup entrypoint | ||
| COPY ./ros_entrypoint.sh / | ||
|
|
||
| ENTRYPOINT ["/ros_entrypoint.sh"] | ||
| CMD ["bash"] |
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| #!/bin/bash | ||
| # http://windsock.io/automated-docker-image-builds-with-multiple-tags/ | ||
|
|
||
| set -e | ||
|
|
||
| # Parse image name for repo name | ||
| tagStart=$(expr index "$IMAGE_NAME" :) | ||
| repoName=${IMAGE_NAME:0:tagStart-1} | ||
|
|
||
| # Tag and push image for each additional tag | ||
| for tag in ardent-ros1-bridge; do | ||
| docker tag $IMAGE_NAME ${repoName}:${tag} | ||
| docker push ${repoName}:${tag} | ||
| done |
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| all: help | ||
|
|
||
| help: | ||
| @echo "" | ||
| @echo "-- Help Menu" | ||
| @echo "" | ||
| @echo " 1. make build - build all images" | ||
| @echo " 2. make pull - pull all images" | ||
| @echo " 3. make clean - remove all images" | ||
| @echo "" | ||
|
|
||
| build: | ||
| @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 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 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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| # This is an auto generated Dockerfile for ros:desktop | ||
| # generated from docker_images_ros2/create_ros_image.Dockerfile.em | ||
| FROM ros:bouncy-ros-base-bionic | ||
| # install ros2 packages | ||
| RUN apt-get update && apt-get install -y \ | ||
| ros-bouncy-desktop=0.5.1-0* \ | ||
| && rm -rf /var/lib/apt/lists/* | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| #!/bin/bash | ||
| # http://windsock.io/automated-docker-image-builds-with-multiple-tags/ | ||
|
|
||
| set -e | ||
|
|
||
| # Parse image name for repo name | ||
| tagStart=$(expr index "$IMAGE_NAME" :) | ||
| repoName=${IMAGE_NAME:0:tagStart-1} | ||
|
|
||
| # Tag and push image for each additional tag | ||
| for tag in bouncy-desktop; do | ||
| docker tag $IMAGE_NAME ${repoName}:${tag} | ||
| docker push ${repoName}:${tag} | ||
| done |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.