Skip to content

Commit 0ff5f46

Browse files
committed
ROS containers: do not define the entrypoint again
1 parent e95590f commit 0ff5f46

9 files changed

+1
-49
lines changed

.github/workflows/docker_builds.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ jobs:
268268
- uses: actions/checkout@v1
269269
- uses: julianoes/Publish-Docker-Github-Action@master
270270
with:
271-
name: px4io/px4-dev-ros-melodic
271+
name: px4io/px4-dev-ros-noetic
272272
username: ${{ secrets.DOCKER_USERNAME }}
273273
password: ${{ secrets.DOCKER_PASSWORD }}
274274
dockerfile: docker/Dockerfile_ros-noetic

docker/Dockerfile_ros-kinetic

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,3 @@ RUN pip install argcomplete argparse catkin_pkg catkin-tools cerberus coverage \
5252

5353
# bootstrap rosdep
5454
RUN rosdep init && rosdep update
55-
56-
# create and start as LOCAL_USER_ID
57-
COPY scripts/entrypoint.sh /usr/local/bin/entrypoint.sh
58-
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
59-
60-
CMD ["/bin/bash"]

docker/Dockerfile_ros-melodic

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,3 @@ RUN pip install argcomplete argparse catkin_pkg catkin-tools cerberus coverage \
4848

4949
# bootstrap rosdep
5050
RUN rosdep init && rosdep update
51-
52-
# create and start as LOCAL_USER_ID
53-
COPY scripts/entrypoint.sh /usr/local/bin/entrypoint.sh
54-
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
55-
56-
CMD ["/bin/bash"]

docker/Dockerfile_ros-noetic

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,3 @@ RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-key C1CF6E31E6B
3939

4040
# bootstrap rosdep
4141
RUN rosdep init && rosdep update
42-
43-
# create and start as LOCAL_USER_ID
44-
COPY scripts/entrypoint.sh /usr/local/bin/entrypoint.sh
45-
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
46-
47-
CMD ["/bin/bash"]

docker/Dockerfile_ros2-ardent

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,3 @@ RUN colcon mixin add default https://raw.githubusercontent.com/colcon/colcon-mix
5757
&& colcon mixin update \
5858
&& colcon metadata add default https://raw.githubusercontent.com/colcon/colcon-metadata-repository/master/index.yaml \
5959
&& colcon metadata update
60-
61-
# create and start as LOCAL_USER_ID
62-
COPY scripts/entrypoint.sh /usr/local/bin/entrypoint.sh
63-
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
64-
65-
CMD ["/bin/bash"]

docker/Dockerfile_ros2-bouncy

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,3 @@ RUN git clone --recursive https://github.com/eProsima/Fast-DDS-Gen.git -b v1.0.4
7272
&& gradle assemble \
7373
&& gradle install \
7474
&& rm -rf /tmp/*
75-
76-
# create and start as LOCAL_USER_ID
77-
COPY scripts/entrypoint.sh /usr/local/bin/entrypoint.sh
78-
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
79-
80-
CMD ["/bin/bash"]

docker/Dockerfile_ros2-crystal

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,3 @@ RUN rm -rf /usr/local/include/fastrtps /usr/local/share/fastrtps /usr/local/lib/
6666
&& cmake -DBUILD_JAVA=ON -DTHIRDPARTY=ON -DSECURITY=ON .. \
6767
&& cmake --build . --target install -- -j $(nproc) \
6868
&& rm -rf /tmp/*
69-
70-
# create and start as LOCAL_USER_ID
71-
COPY scripts/entrypoint.sh /usr/local/bin/entrypoint.sh
72-
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
73-
74-
CMD ["/bin/bash"]

docker/Dockerfile_ros2-dashing

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,3 @@ RUN colcon mixin add default https://raw.githubusercontent.com/colcon/colcon-mix
5858
&& colcon mixin update \
5959
&& colcon metadata add default https://raw.githubusercontent.com/colcon/colcon-metadata-repository/master/index.yaml \
6060
&& colcon metadata update
61-
62-
# create and start as LOCAL_USER_ID
63-
COPY scripts/entrypoint.sh /usr/local/bin/entrypoint.sh
64-
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
65-
66-
CMD ["/bin/bash"]

docker/Dockerfile_ros2-eloquent

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,3 @@ RUN rm -rf /usr/local/include/fastrtps /usr/local/share/fastrtps /usr/local/lib/
7575
&& cmake -DTHIRDPARTY=ON -DSECURITY=ON .. \
7676
&& cmake --build . --target install -- -j $(nproc) \
7777
&& rm -rf /tmp/*
78-
79-
# create and start as LOCAL_USER_ID
80-
COPY scripts/entrypoint.sh /usr/local/bin/entrypoint.sh
81-
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
82-
83-
CMD ["/bin/bash"]

0 commit comments

Comments
 (0)