diff --git a/docker/Dockerfile_aarch64 b/docker/Dockerfile_aarch64 index 52a84aa..c1e9786 100644 --- a/docker/Dockerfile_aarch64 +++ b/docker/Dockerfile_aarch64 @@ -73,35 +73,10 @@ RUN wget -q https://downloads.sourceforge.net/project/astyle/astyle/astyle%203.1 && make -f ../build/gcc/Makefile -j$(nproc) && cp bin/astyle /usr/local/bin \ && rm -rf /tmp/* -# Gradle (Required to build Fast-RTPS-Gen) -RUN wget -q "https://services.gradle.org/distributions/gradle-5.6.2-bin.zip" -O /tmp/gradle-5.6.2-bin.zip \ - && mkdir /opt/gradle \ - && cd /tmp \ - && unzip -d /opt/gradle gradle-5.6.2-bin.zip \ - && rm -rf /tmp/* - -ENV PATH "/opt/gradle/gradle-5.6.2/bin:$PATH" - -# Fast-RTPS -RUN git clone --recursive https://github.com/eProsima/Fast-DDS.git -b v1.8.2 /tmp/FastRTPS-1.8.2 \ - && cd /tmp/FastRTPS-1.8.2 \ - && mkdir build && cd build \ - && cmake -DTHIRDPARTY=ON -DSECURITY=ON .. \ - && cmake --build . --target install -- -j $(nproc) \ - && rm -rf /tmp/* - -# Fast-RTPS-Gen 1.0.4 -RUN git clone --recursive https://github.com/eProsima/Fast-DDS-Gen.git -b v1.0.4 /tmp/Fast-RTPS-Gen-1.0.4 \ - && cd /tmp/Fast-RTPS-Gen-1.0.4 \ - && gradle assemble \ - && gradle install \ - && rm -rf /tmp/* - # create user with id 1001 (jenkins docker workflow default) RUN useradd --shell /bin/bash -u 1001 -c "" -m user && usermod -a -G dialout user ENV CCACHE_UMASK=000 -ENV FASTRTPSGEN_DIR="/usr/local/bin/" ENV PATH="/usr/lib/ccache:$PATH" ENV TERM=xterm ENV TZ=UTC diff --git a/docker/Dockerfile_armhf b/docker/Dockerfile_armhf index 90630e0..8deb00e 100644 --- a/docker/Dockerfile_armhf +++ b/docker/Dockerfile_armhf @@ -79,7 +79,6 @@ RUN wget -q https://downloads.sourceforge.net/project/astyle/astyle/astyle%203.1 RUN useradd --shell /bin/bash -u 1001 -c "" -m user && usermod -a -G dialout user ENV CCACHE_UMASK=000 -ENV FASTRTPSGEN_DIR="/usr/local/bin/" ENV PATH="/usr/lib/ccache:$PATH" ENV TERM=xterm ENV TZ=UTC diff --git a/docker/Dockerfile_base-archlinux b/docker/Dockerfile_base-archlinux index cf0312f..4a1eaea 100644 --- a/docker/Dockerfile_base-archlinux +++ b/docker/Dockerfile_base-archlinux @@ -51,38 +51,6 @@ RUN wget https://sourceforge.net/projects/romfs/files/genromfs/0.5.2/genromfs-0. RUN curl -sSL https://github.com/tianon/gosu/releases/download/1.8/gosu-amd64 > /usr/sbin/gosu \ && chmod +x /usr/sbin/gosu -# Gradle (Required to build Fast-RTPS-Gen) -RUN wget -q "https://services.gradle.org/distributions/gradle-6.1-rc-3-bin.zip" -O /tmp/gradle-6.1-rc-3-bin.zip \ - && mkdir /opt/gradle \ - && cd /tmp \ - && unzip -d /opt/gradle gradle-6.1-rc-3-bin.zip \ - && rm -rf /tmp/* - -ENV PATH "/opt/gradle/gradle-6.1-rc-3/bin:$PATH" - -# Intall foonathan_memory from source as it is required to Fast-RTPS >= 1.9 -RUN git clone https://github.com/eProsima/foonathan_memory_vendor.git /tmp/foonathan_memory \ - && cd /tmp/foonathan_memory \ - && mkdir build && cd build \ - && cmake .. \ - && cmake --build . --target install -- -j $(nproc) \ - && rm -rf /tmp/* - -# Fast-DDS 2.0.0 -RUN git clone --recursive https://github.com/eProsima/Fast-DDS.git -b v2.0.0 /tmp/FastRTPS-2.0.0 \ - && cd /tmp/FastRTPS-2.0.0 \ - && mkdir build && cd build \ - && cmake -DTHIRDPARTY=ON -DSECURITY=ON .. \ - && cmake --build . --target install -- -j $(nproc) \ - && rm -rf /tmp/* - -# Fast-RTPS-Gen 1.0.4 -RUN git clone --recursive https://github.com/eProsima/Fast-DDS-Gen.git -b v1.0.4 /tmp/Fast-RTPS-Gen-1.0.4 \ - && cd /tmp/Fast-RTPS-Gen-1.0.4 \ - && gradle assemble \ - && gradle install \ - && rm -rf /tmp/* - # Add group dialout RUN groupadd dialout @@ -91,7 +59,6 @@ RUN ln -s /usr/bin/ccache /usr/lib/ccache/bin/arm-none-eabi-gcc \ && ln -s /usr/bin/ccache /usr/lib/ccache/bin/arm-none-eabi-g++ ENV CCACHE_MAXSIZE=1G -ENV FASTRTPSGEN_DIR="/usr/local/bin/" ENV PATH "/usr/lib/ccache/bin:$PATH" ENV TERM=xterm diff --git a/docker/Dockerfile_base-bionic b/docker/Dockerfile_base-bionic index 719f8c5..044d2d3 100644 --- a/docker/Dockerfile_base-bionic +++ b/docker/Dockerfile_base-bionic @@ -76,30 +76,6 @@ RUN wget -q https://downloads.sourceforge.net/project/astyle/astyle/astyle%203.1 && make -f ../build/gcc/Makefile -j$(nproc) && cp bin/astyle /usr/local/bin \ && rm -rf /tmp/* -# Gradle (Required to build Fast-RTPS-Gen) -RUN wget -q "https://services.gradle.org/distributions/gradle-6.3-rc-4-bin.zip" -O /tmp/gradle-6.3-rc-4-bin.zip \ - && mkdir /opt/gradle \ - && cd /tmp \ - && unzip -d /opt/gradle gradle-6.3-rc-4-bin.zip \ - && rm -rf /tmp/* - -ENV PATH "/opt/gradle/gradle-6.3-rc-4/bin:$PATH" - -# Fast-RTPS 1.8.4 -RUN git clone --recursive https://github.com/eProsima/Fast-DDS.git -b v1.8.4 /tmp/FastRTPS-1.8.4 \ - && cd /tmp/FastRTPS-1.8.4 \ - && mkdir build && cd build \ - && cmake -DTHIRDPARTY=ON -DSECURITY=ON .. \ - && cmake --build . --target install -- -j $(nproc) \ - && rm -rf /tmp/* - -# Fast-RTPS-Gen 1.0.4 -RUN git clone --recursive https://github.com/eProsima/Fast-DDS-Gen.git -b v1.0.4 /tmp/Fast-RTPS-Gen-1.0.4 \ - && cd /tmp/Fast-RTPS-Gen-1.0.4 \ - && gradle assemble \ - && gradle install \ - && rm -rf /tmp/* - # create user with id 1001 (jenkins docker workflow default) RUN useradd --shell /bin/bash -u 1001 -c "" -m user && usermod -a -G dialout user @@ -110,7 +86,6 @@ RUN mkdir /tmp/.X11-unix && \ ENV DISPLAY :99 ENV CCACHE_UMASK=000 -ENV FASTRTPSGEN_DIR="/usr/local/bin/" ENV PATH="/usr/lib/ccache:$PATH" ENV TERM=xterm ENV TZ=UTC diff --git a/docker/Dockerfile_base-focal b/docker/Dockerfile_base-focal index c8f8dc3..d3c60d9 100644 --- a/docker/Dockerfile_base-focal +++ b/docker/Dockerfile_base-focal @@ -76,38 +76,6 @@ RUN wget -q https://downloads.sourceforge.net/project/astyle/astyle/astyle%203.1 && make -f ../build/gcc/Makefile -j$(nproc) && cp bin/astyle /usr/local/bin \ && rm -rf /tmp/* -# Gradle (Required to build Fast-RTPS-Gen) -RUN wget -q "https://services.gradle.org/distributions/gradle-6.3-rc-4-bin.zip" -O /tmp/gradle-6.3-rc-4-bin.zip \ - && mkdir /opt/gradle \ - && cd /tmp \ - && unzip -d /opt/gradle gradle-6.3-rc-4-bin.zip \ - && rm -rf /tmp/* - -ENV PATH "/opt/gradle/gradle-6.3-rc-4/bin:$PATH" - -# Intall foonathan_memory from source as it is required to Fast-RTPS >= 1.9 -RUN git clone https://github.com/eProsima/foonathan_memory_vendor.git /tmp/foonathan_memory \ - && cd /tmp/foonathan_memory \ - && mkdir build && cd build \ - && cmake .. \ - && cmake --build . --target install -- -j $(nproc) \ - && rm -rf /tmp/* - -# Fast-DDS (Fast-RTPS 2.0.2) -RUN git clone --recursive https://github.com/eProsima/Fast-DDS.git -b v2.0.2 /tmp/FastDDS-2.0.2 \ - && cd /tmp/FastDDS-2.0.2 \ - && mkdir build && cd build \ - && cmake -DTHIRDPARTY=ON -DSECURITY=ON .. \ - && cmake --build . --target install -- -j $(nproc) \ - && rm -rf /tmp/* - -# Fast-RTPS-Gen 1.0.4 -RUN git clone --recursive https://github.com/eProsima/Fast-DDS-Gen.git -b v1.0.4 /tmp/Fast-RTPS-Gen-1.0.4 \ - && cd /tmp/Fast-RTPS-Gen-1.0.4 \ - && gradle assemble \ - && gradle install \ - && rm -rf /tmp/* - # create user with id 1001 (jenkins docker workflow default) RUN useradd --shell /bin/bash -u 1001 -c "" -m user && usermod -a -G dialout user @@ -118,7 +86,6 @@ RUN mkdir /tmp/.X11-unix && \ ENV DISPLAY :99 ENV CCACHE_UMASK=000 -ENV FASTRTPSGEN_DIR="/usr/local/bin/" ENV PATH="/usr/lib/ccache:$PATH" ENV TERM=xterm ENV TZ=UTC diff --git a/docker/Dockerfile_base-jammy b/docker/Dockerfile_base-jammy index 4fe411c..cb4bda4 100644 --- a/docker/Dockerfile_base-jammy +++ b/docker/Dockerfile_base-jammy @@ -106,7 +106,6 @@ RUN mkdir /tmp/.X11-unix && \ ENV DISPLAY :99 ENV CCACHE_UMASK=000 -ENV FASTRTPSGEN_DIR="/usr/local/bin/" ENV PATH="/usr/lib/ccache:$PATH" ENV TERM=xterm ENV TZ=UTC diff --git a/docker/Dockerfile_ros2-eloquent b/docker/Dockerfile_ros2-eloquent index 946b5bc..dda11b9 100644 --- a/docker/Dockerfile_ros2-eloquent +++ b/docker/Dockerfile_ros2-eloquent @@ -58,20 +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 - -# Intall foonathan_memory from source as it is required to Fast-RTPS >= 1.9 -RUN git clone https://github.com/eProsima/foonathan_memory_vendor.git /tmp/foonathan_memory \ - && cd /tmp/foonathan_memory \ - && mkdir build && cd build \ - && cmake .. \ - && cmake --build . --target install -- -j $(nproc) \ - && rm -rf /tmp/* - -# Install Fast-RTPS 1.9.3 -RUN rm -rf /usr/local/include/fastrtps /usr/local/share/fastrtps /usr/local/lib/libfastrtps* \ - && git clone --recursive https://github.com/eProsima/Fast-DDS.git -b v1.9.3 /tmp/FastRTPS-1.9.3 \ - && cd /tmp/FastRTPS-1.9.3 \ - && mkdir build && cd build \ - && cmake -DTHIRDPARTY=ON -DSECURITY=ON .. \ - && cmake --build . --target install -- -j $(nproc) \ - && rm -rf /tmp/* diff --git a/docker/Dockerfile_ros2-galactic b/docker/Dockerfile_ros2-galactic index b344888..8a38710 100644 --- a/docker/Dockerfile_ros2-galactic +++ b/docker/Dockerfile_ros2-galactic @@ -62,15 +62,6 @@ RUN colcon mixin add default \ https://raw.githubusercontent.com/colcon/colcon-metadata-repository/master/index.yaml \ && colcon metadata update -# Install Fast-DDS 2.3.1 -RUN rm -rf /usr/local/include/fastrtps /usr/local/share/fastrtps /usr/local/lib/libfastrtps* \ - && git clone --recursive https://github.com/eProsima/Fast-DDS.git -b v2.3.1 /tmp/FastRTPS-2.3.1 \ - && cd /tmp/FastRTPS-2.3.1 \ - && mkdir build && cd build \ - && 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"] diff --git a/docker/Dockerfile_ros2-rolling b/docker/Dockerfile_ros2-rolling index 5e6f770..a42a75a 100644 --- a/docker/Dockerfile_ros2-rolling +++ b/docker/Dockerfile_ros2-rolling @@ -67,15 +67,6 @@ RUN colcon mixin add default \ https://raw.githubusercontent.com/colcon/colcon-metadata-repository/master/index.yaml \ && colcon metadata update -# Install Fast-DDS 2.3.1 -RUN rm -rf /usr/local/include/fastrtps /usr/local/share/fastrtps /usr/local/lib/libfastrtps* \ - && git clone --recursive https://github.com/eProsima/Fast-DDS.git -b v2.3.1 /tmp/FastRTPS-2.3.1 \ - && cd /tmp/FastRTPS-2.3.1 \ - && mkdir build && cd build \ - && 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"]