From 6338f8fbb09c874f741ea4c924f262ae9224cee3 Mon Sep 17 00:00:00 2001 From: Mathieu Rohon Date: Wed, 26 Apr 2017 10:28:18 +0200 Subject: Add skydive service This patch introduces the docker template to build the skydive container, that can be used to monitor and troubleshoot networking in an openstack deployment. The skydive-analyzer and the skydive-agent will both rely on the same container. Implements: blueprint skydive-service Co-Authored-By: Nicolas Bouron Signed-off-by: Mathieu Rohon Change-Id: Iab783179c2c3aba496a91debfd38a12215ae9f10 --- docker/skydive/skydive-agent/Dockerfile.j2 | 7 +++++++ docker/skydive/skydive-analyzer/Dockerfile.j2 | 8 ++++++++ docker/skydive/skydive-base/Dockerfile.j2 | 20 ++++++++++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 docker/skydive/skydive-agent/Dockerfile.j2 create mode 100644 docker/skydive/skydive-analyzer/Dockerfile.j2 create mode 100644 docker/skydive/skydive-base/Dockerfile.j2 (limited to 'docker') diff --git a/docker/skydive/skydive-agent/Dockerfile.j2 b/docker/skydive/skydive-agent/Dockerfile.j2 new file mode 100644 index 000000000..50708e13a --- /dev/null +++ b/docker/skydive/skydive-agent/Dockerfile.j2 @@ -0,0 +1,7 @@ +FROM {{ namespace }}/{{ image_prefix }}skydive-base:{{ tag }} +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" + +{% block skydive_agent_header %}{% endblock %} + +{% block skydive_agent_footer %}{% endblock %} +{% block footer %}{% endblock %} diff --git a/docker/skydive/skydive-analyzer/Dockerfile.j2 b/docker/skydive/skydive-analyzer/Dockerfile.j2 new file mode 100644 index 000000000..409076daf --- /dev/null +++ b/docker/skydive/skydive-analyzer/Dockerfile.j2 @@ -0,0 +1,8 @@ +FROM {{ namespace }}/{{ image_prefix }}skydive-base:{{ tag }} +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" + +{% block skydive_analyzer_header %}{% endblock %} +{% block skydive_analyzer_footer %}{% endblock %} +{% block footer %}{% endblock %} + +USER skydive diff --git a/docker/skydive/skydive-base/Dockerfile.j2 b/docker/skydive/skydive-base/Dockerfile.j2 new file mode 100644 index 000000000..ccb8dbf83 --- /dev/null +++ b/docker/skydive/skydive-base/Dockerfile.j2 @@ -0,0 +1,20 @@ +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" + +{% block skydive_base_header %}{% endblock %} + +{% import "macros.j2" as macros with context %} + +{{ macros.configure_user(name='skydive') }} + +{% if base_arch == 'x86_64' %} + +{% block skydive_install %} +RUN curl -o /usr/bin/skydive -L "https://github.com/skydive-project/skydive/releases/download/v0.11.0/skydive" \ + && chmod +x /usr/bin/skydive +{% endblock %} + +{% endif %} + +{% block skydive_base_footer %}{% endblock %} +{% block footer %}{% endblock %} -- cgit v1.2.3