From edace42fda8d8cecf0bd1523f21e8f0d31df5798 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20L=C3=BCtkebohle?= Date: Wed, 3 Jul 2019 19:07:45 +0000 Subject: [PATCH] Move build of preparatory packages into docker image. --- .gitlab-ci.yml | 7 +------ docker-ci-base/Dockerfile | 6 ++++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d7c985b..79df2a3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,13 +9,8 @@ services: - docker:dind build_enabled: + image: $base_image_id script: - - vcs import < instrumentation.repos - - vcs import < ci_source_deps.repos - - apt-get update - - rosdep update - - rosdep install --from-paths . --ignore-src --rosdistro dashing -y --skip-keys "console_bridge fastcdr fastrtps libopensplice67 libopensplice69 rti-connext-dds-5.3.1 urdfdom_headers" - - apt-get purge -y ros-dashing-fastrtps - lttng-sessiond --daemonize - colcon build --symlink-install --cmake-args " -DWITH_LTTNG=ON" --packages-up-to $PACKAGES_LIST - colcon test --packages-select $PACKAGES_LIST diff --git a/docker-ci-base/Dockerfile b/docker-ci-base/Dockerfile index 8deb9ab..70db41d 100644 --- a/docker-ci-base/Dockerfile +++ b/docker-ci-base/Dockerfile @@ -20,3 +20,9 @@ RUN apt-get install --no-install-recommends -y \ ENV RTI_NC_LICENSE_ACCEPTED=yes RUN apt-get install --no-install-recommends -y \ rti-connext-dds-5.3.1 +RUN vcs import < instrumentation.repos && vcs import < ci_source_deps.repos +RUN apt-get update && rosdep update && rosdep install --from-paths . --ignore-src --rosdistro dashing -y --skip-keys "console_bridge fastcdr fastrtps libopensplice67 libopensplice69 rti-connext-dds-5.3.1 urdfdom_headers" +RUN apt-get purge -y ros-dashing-fastrtps + +RUN colcon build --symlink-install --cmake-args " -DWITH_LTTNG=ON" --packages-up-to rclcpp +