From f8394a268a8bab29251b27d66d93a634c150b319 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Tue, 20 Apr 2021 21:23:02 -0700 Subject: [PATCH] Building catkin in Dockerfile much faster than github actions development, can port to that later --- .gitmodules | 3 +++ Dockerfile | 22 ++++++++++++++++++++++ core/catkin_pkg | 1 + 3 files changed, 26 insertions(+) create mode 100644 Dockerfile create mode 160000 core/catkin_pkg diff --git a/.gitmodules b/.gitmodules index fb0e403..5affa09 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "core/catkin"] path = core/catkin url = git@github.com:ros/catkin +[submodule "core/catkin_pkg"] + path = core/catkin_pkg + url = git@github.com:ros-infrastructure/catkin_pkg diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..82f118a --- /dev/null +++ b/Dockerfile @@ -0,0 +1,22 @@ +FROM ubuntu:20.04 + +ENV DEBIAN_FRONTEND="noninteractive" + +# be able to source files +RUN rm /bin/sh && ln -s /bin/bash /bin/sh + +RUN apt-get update +RUN apt-get install -y build-essential +RUN apt-get install -y git +RUN git clone https://github.com/ros-infrastructure/catkin_pkg +RUN apt-get install -y python3 +RUN apt-get install -y python3-setuptools +RUN cd catkin_pkg && python3 setup.py install + +RUN apt-get install -y cmake + +RUN git clone https://github.com/ros/catkin +RUN mkdir build/catkin -p +RUN apt-get install -y python3-empy +RUN apt-get install -y python-is-python3 +RUN cd build/catkin && cmake ../../catkin -DCATKIN_BUILD_BINARY_PACKAGE=OFF -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic -DPYTHON_EXECUTABLE=/usr/bin/python -DSETUPTOOLS_DEB_LAYOUT=OFF && make && make install diff --git a/core/catkin_pkg b/core/catkin_pkg new file mode 160000 index 0000000..ad07ab2 --- /dev/null +++ b/core/catkin_pkg @@ -0,0 +1 @@ +Subproject commit ad07ab2570006a72994657ab3f3267a9e84469aa