Removing duplicate entrypoints

osrf · Jan 26, 2018 · c2df51a · c2df51a
1 parent 2cc89a3
commit c2df51a
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 24 deletions.
diff --git a/ros2/.config/images.yaml.em b/ros2/.config/images.yaml.em
@@ -18,7 +18,6 @@ images:
         base_image: osrf/@(user_name):@(ros2distro_name)-core
         maintainer_name: @(maintainer_name)
         template_name: docker_images/create_ros2_image.Dockerfile.em
-        entrypoint_name: docker_images/ros2_entrypoint.sh
         template_packages:
             - docker_templates
         packages:
@@ -50,7 +49,6 @@ images:
         base_image: osrf/@(user_name):@(ros2distro_name)-basic
         maintainer_name: @(maintainer_name)
         template_name: docker_images/create_ros2_image.Dockerfile.em
-        entrypoint_name: docker_images/ros2_entrypoint.sh
         template_packages:
             - docker_templates
         ros2_packages:

diff --git a/ros2/ardent/ubuntu/xenial/ardent-basic/Dockerfile b/ros2/ardent/ubuntu/xenial/ardent-basic/Dockerfile
@@ -34,7 +34,3 @@ RUN apt-get update && apt-get install -y \
     ros-ardent-topic-monitor \
     && rm -rf /var/lib/apt/lists/*
 
-# setup entrypoint
-COPY ./ros2_entrypoint.sh /
-
-ENTRYPOINT ["/ros2_entrypoint.sh"]
diff --git a/ros2/ardent/ubuntu/xenial/ardent-basic/ros2_entrypoint.sh b/ros2/ardent/ubuntu/xenial/ardent-basic/ros2_entrypoint.sh
diff --git a/ros2/ardent/ubuntu/xenial/ardent-full/Dockerfile b/ros2/ardent/ubuntu/xenial/ardent-full/Dockerfile
@@ -26,7 +26,3 @@ RUN apt-get update && apt-get install -y \
     ros-ardent-teleop-twist-keyboard \
     && rm -rf /var/lib/apt/lists/*
 
-# setup entrypoint
-COPY ./ros2_entrypoint.sh /
-
-ENTRYPOINT ["/ros2_entrypoint.sh"]
diff --git a/ros2/ardent/ubuntu/xenial/ardent-full/ros2_entrypoint.sh b/ros2/ardent/ubuntu/xenial/ardent-full/ros2_entrypoint.sh
diff --git a/ros2/ardent/ubuntu/xenial/images.yaml.em b/ros2/ardent/ubuntu/xenial/images.yaml.em
@@ -18,7 +18,6 @@ images:
         base_image: osrf/@(user_name):@(ros2distro_name)-core
         maintainer_name: @(maintainer_name)
         template_name: docker_images/create_ros2_image.Dockerfile.em
-        entrypoint_name: docker_images/ros2_entrypoint.sh
         template_packages:
             - docker_templates
         packages:
@@ -50,7 +49,6 @@ images:
         base_image: osrf/@(user_name):@(ros2distro_name)-basic
         maintainer_name: @(maintainer_name)
         template_name: docker_images/create_ros2_image.Dockerfile.em
-        entrypoint_name: docker_images/ros2_entrypoint.sh
         template_packages:
             - docker_templates
         ros2_packages: