aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-06 10:07:59 +0000
committerGerrit Code Review <review@openstack.org>2017-06-06 10:08:00 +0000
commit1253c694f09213a8056cc7715c153333d3e1ee64 (patch)
treed7c132fd74e4966157c2ad43bfc8186581b83557 /docker
parent8316f249838e31dcfad1f1b3484df49f80b19d20 (diff)
parent6338f8fbb09c874f741ea4c924f262ae9224cee3 (diff)
downloadkolla-1253c694f09213a8056cc7715c153333d3e1ee64.tar.gz
kolla-1253c694f09213a8056cc7715c153333d3e1ee64.zip
Merge "Add skydive service"
Diffstat (limited to 'docker')
-rw-r--r--docker/skydive/skydive-agent/Dockerfile.j27
-rw-r--r--docker/skydive/skydive-analyzer/Dockerfile.j28
-rw-r--r--docker/skydive/skydive-base/Dockerfile.j220
3 files changed, 35 insertions, 0 deletions
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 %}