ROS containers: do not define the entrypoint again

PX4 · Jun 28, 2020 · 0ff5f46 · 0ff5f46
1 parent e95590f
commit 0ff5f46
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 49 deletions.
diff --git a/.github/workflows/docker_builds.yml b/.github/workflows/docker_builds.yml
@@ -268,7 +268,7 @@ jobs:
     - uses: actions/checkout@v1
     - uses: julianoes/Publish-Docker-Github-Action@master
       with:
-        name: px4io/px4-dev-ros-melodic
+        name: px4io/px4-dev-ros-noetic
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
         dockerfile: docker/Dockerfile_ros-noetic

diff --git a/docker/Dockerfile_ros-kinetic b/docker/Dockerfile_ros-kinetic
@@ -52,9 +52,3 @@ RUN pip install argcomplete argparse catkin_pkg catkin-tools cerberus coverage \
 
 # bootstrap rosdep
 RUN rosdep init && rosdep update
-
-# create and start as LOCAL_USER_ID
-COPY scripts/entrypoint.sh /usr/local/bin/entrypoint.sh
-ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
-
-CMD ["/bin/bash"]
diff --git a/docker/Dockerfile_ros-melodic b/docker/Dockerfile_ros-melodic
@@ -48,9 +48,3 @@ RUN pip install argcomplete argparse catkin_pkg catkin-tools cerberus coverage \
 
 # bootstrap rosdep
 RUN rosdep init && rosdep update
-
-# create and start as LOCAL_USER_ID
-COPY scripts/entrypoint.sh /usr/local/bin/entrypoint.sh
-ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
-
-CMD ["/bin/bash"]
diff --git a/docker/Dockerfile_ros-noetic b/docker/Dockerfile_ros-noetic
@@ -39,9 +39,3 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-key C1CF6E31E6B
 
 # bootstrap rosdep
 RUN rosdep init && rosdep update
-
-# create and start as LOCAL_USER_ID
-COPY scripts/entrypoint.sh /usr/local/bin/entrypoint.sh
-ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
-
-CMD ["/bin/bash"]
diff --git a/docker/Dockerfile_ros2-ardent b/docker/Dockerfile_ros2-ardent
@@ -57,9 +57,3 @@ RUN colcon mixin add default https://raw.githubusercontent.com/colcon/colcon-mix
 	&& colcon mixin update \
 	&& colcon metadata add default https://raw.githubusercontent.com/colcon/colcon-metadata-repository/master/index.yaml \
 	&& colcon metadata update
-
-# create and start as LOCAL_USER_ID
-COPY scripts/entrypoint.sh /usr/local/bin/entrypoint.sh
-ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
-
-CMD ["/bin/bash"]
diff --git a/docker/Dockerfile_ros2-bouncy b/docker/Dockerfile_ros2-bouncy
@@ -72,9 +72,3 @@ RUN git clone --recursive https://github.com/eProsima/Fast-DDS-Gen.git -b v1.0.4
 	&& gradle assemble \
 	&& gradle install \
 	&& rm -rf /tmp/*
-
-# create and start as LOCAL_USER_ID
-COPY scripts/entrypoint.sh /usr/local/bin/entrypoint.sh
-ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
-
-CMD ["/bin/bash"]
diff --git a/docker/Dockerfile_ros2-crystal b/docker/Dockerfile_ros2-crystal
@@ -66,9 +66,3 @@ RUN rm -rf /usr/local/include/fastrtps /usr/local/share/fastrtps /usr/local/lib/
 	&& cmake -DBUILD_JAVA=ON -DTHIRDPARTY=ON -DSECURITY=ON .. \
 	&& cmake --build . --target install -- -j $(nproc) \
 	&& rm -rf /tmp/*
-
-# create and start as LOCAL_USER_ID
-COPY scripts/entrypoint.sh /usr/local/bin/entrypoint.sh
-ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
-
-CMD ["/bin/bash"]
diff --git a/docker/Dockerfile_ros2-dashing b/docker/Dockerfile_ros2-dashing
@@ -58,9 +58,3 @@ RUN colcon mixin add default https://raw.githubusercontent.com/colcon/colcon-mix
 	&& colcon mixin update \
 	&& colcon metadata add default https://raw.githubusercontent.com/colcon/colcon-metadata-repository/master/index.yaml \
 	&& colcon metadata update
-
-# create and start as LOCAL_USER_ID
-COPY scripts/entrypoint.sh /usr/local/bin/entrypoint.sh
-ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
-
-CMD ["/bin/bash"]
diff --git a/docker/Dockerfile_ros2-eloquent b/docker/Dockerfile_ros2-eloquent
@@ -75,9 +75,3 @@ RUN rm -rf /usr/local/include/fastrtps /usr/local/share/fastrtps /usr/local/lib/
 	&& cmake -DTHIRDPARTY=ON -DSECURITY=ON .. \
 	&& cmake --build . --target install -- -j $(nproc) \
 	&& rm -rf /tmp/*
-
-# create and start as LOCAL_USER_ID
-COPY scripts/entrypoint.sh /usr/local/bin/entrypoint.sh
-ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
-
-CMD ["/bin/bash"]