summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-08-08 12:45:54 +0000
committerGerrit Code Review <review@openstack.org>2018-08-08 12:45:54 +0000
commit5b73ed78baacedfd9706bb0598212eb3269f5287 (patch)
tree51182a2adf5814279122d2013024689391674c36
parentcd1f1f1ff3a0280f2820e4d0e73b96d14ed9f1e2 (diff)
parent7a5b6836c16e6ae5be6b406c681571a408a3f327 (diff)
Merge "skydive: use packages on rpm based distros"
-rw-r--r--docker/skydive/skydive-agent/Dockerfile.j25
-rw-r--r--docker/skydive/skydive-analyzer/Dockerfile.j211
-rw-r--r--docker/skydive/skydive-base/Dockerfile.j214
3 files changed, 25 insertions, 5 deletions
diff --git a/docker/skydive/skydive-agent/Dockerfile.j2 b/docker/skydive/skydive-agent/Dockerfile.j2
index 204aace..35862de 100644
--- a/docker/skydive/skydive-agent/Dockerfile.j2
+++ b/docker/skydive/skydive-agent/Dockerfile.j2
@@ -7,7 +7,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
7 7
8{% block skydive_agent_install %} 8{% block skydive_agent_install %}
9{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} 9{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
10 {% set skydive_agent_packages = ['openvswitch'] %} 10 {% set skydive_agent_packages = [
11 'openvswitch',
12 'skydive-agent'
13 ] %}
11{% elif base_distro in ['debian', 'ubuntu'] %} 14{% elif base_distro in ['debian', 'ubuntu'] %}
12 {% set skydive_agent_packages = ['openvswitch-common'] %} 15 {% set skydive_agent_packages = ['openvswitch-common'] %}
13{% endif %} 16{% endif %}
diff --git a/docker/skydive/skydive-analyzer/Dockerfile.j2 b/docker/skydive/skydive-analyzer/Dockerfile.j2
index 409076d..a81a92c 100644
--- a/docker/skydive/skydive-analyzer/Dockerfile.j2
+++ b/docker/skydive/skydive-analyzer/Dockerfile.j2
@@ -2,7 +2,18 @@ FROM {{ namespace }}/{{ image_prefix }}skydive-base:{{ tag }}
2LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" 2LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
3 3
4{% block skydive_analyzer_header %}{% endblock %} 4{% block skydive_analyzer_header %}{% endblock %}
5
6{% import "macros.j2" as macros with context %}
7
8{% block skydive_analyzer_install %}
9{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
10 {% set skydive_analyzer_packages = ['skydive-analyzer'] %}
11{{ macros.install_packages(skydive_analyzer_packages | customizable("packages")) }}
12{% endif %}
13{% endblock %}
14
5{% block skydive_analyzer_footer %}{% endblock %} 15{% block skydive_analyzer_footer %}{% endblock %}
16
6{% block footer %}{% endblock %} 17{% block footer %}{% endblock %}
7 18
8USER skydive 19USER skydive
diff --git a/docker/skydive/skydive-base/Dockerfile.j2 b/docker/skydive/skydive-base/Dockerfile.j2
index c3ded88..5b6bb13 100644
--- a/docker/skydive/skydive-base/Dockerfile.j2
+++ b/docker/skydive/skydive-base/Dockerfile.j2
@@ -7,14 +7,20 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
7 7
8{{ macros.configure_user(name='skydive') }} 8{{ macros.configure_user(name='skydive') }}
9 9
10{% if base_arch == 'x86_64' %}
11
12{% block skydive_install %} 10{% block skydive_install %}
11{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
12 {% set skydive_base_packages = ['skydive'] %}
13{{ macros.install_packages(skydive_base_packages | customizable("packages")) }}
14{% else %}
15 {% if base_arch != 'x86_64' %}
16RUN echo '{{ install_type }} on {{ base_distro }} not yet available on non x86_64 platforms' \
17 && /bin/false
18 {% else %}
13RUN curl -o /usr/bin/skydive -L "https://github.com/skydive-project/skydive/releases/download/v0.18.0/skydive" \ 19RUN curl -o /usr/bin/skydive -L "https://github.com/skydive-project/skydive/releases/download/v0.18.0/skydive" \
14 && chmod +x /usr/bin/skydive 20 && chmod +x /usr/bin/skydive
15{% endblock %} 21 {% endif %}
16
17{% endif %} 22{% endif %}
23{% endblock %}
18 24
19COPY extend_start.sh /usr/local/bin/kolla_extend_start 25COPY extend_start.sh /usr/local/bin/kolla_extend_start
20RUN chmod 755 /usr/local/bin/kolla_extend_start 26RUN chmod 755 /usr/local/bin/kolla_extend_start