From aab85e843ca299fdf017d977f0635d0124f3b986 Mon Sep 17 00:00:00 2001
From: Christophe Bedard <fixed-term.christophe.bourquebedard@de.bosch.com>
Date: Tue, 25 Jun 2019 14:12:10 +0200
Subject: [PATCH] Use base docker image with installed dependencies

---
 .gitlab-ci.yml            |  5 +----
 docker-ci-base/Dockerfile | 13 +++++++++++++
 2 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 docker-ci-base/Dockerfile

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4e7476c..d98cf2d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: ros:dashing-ros-base-bionic
+image: registry.gitlab.com/ros_tracing/ros2_tracing/ci-base:latest
 
 variables:
   DOCKER_DRIVER: overlay2
@@ -8,10 +8,7 @@ before_script:
   - vcs import < instrumentation.repos
   - vcs import < ci_source_deps.repos
   - apt-get update
-  - apt-get install --no-install-recommends -y libasio-dev libtinyxml2-dev
-  - apt-get install -y python3-lttng python3-babeltrace
   - rosdep update
-  - export RTI_NC_LICENSE_ACCEPTED=yes
   - 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"
 
 # build:
diff --git a/docker-ci-base/Dockerfile b/docker-ci-base/Dockerfile
new file mode 100644
index 0000000..77e45a7
--- /dev/null
+++ b/docker-ci-base/Dockerfile
@@ -0,0 +1,13 @@
+FROM ros:dashing-ros-base-bionic
+
+RUN apt-get update
+RUN apt-get install --no-install-recommends -y \
+    libasio-dev \
+    libtinyxml2-dev
+
+RUN apt-get install -y \
+    python3-lttng \
+    python3-babeltrace
+
+ENV RTI_NC_LICENSE_ACCEPTED=yes
+RUN apt-get install rti-connext-dds-5.3.1