openstack/kolla
Code Issues Proposed changes

skydive: use packages on rpm based distros

Browse Source 
Change-Id: Ifd665a81822c042ee03f6b11da57593472e0a1cb
This commit is contained in:
Sylvain Baubeau 2018-07-27 15:58:10 +02:00
parent d7cd35ff9a
commit 7a5b6836c1
3 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/skydive/skydive-agent/Dockerfile.j2
View File

@ -7,7 +7,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block skydive_agent_install %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set skydive_agent_packages = ['openvswitch'] %}
{% set skydive_agent_packages = [
'openvswitch',
'skydive-agent'
] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set skydive_agent_packages = ['openvswitch-common'] %}
{% endif %}

11
docker/skydive/skydive-analyzer/Dockerfile.j2
View File

@ -2,7 +2,18 @@ FROM {{ namespace }}/{{ image_prefix }}skydive-base:{{ tag }}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
{% block skydive_analyzer_header %}{% endblock %}
{% import "macros.j2" as macros with context %}
{% block skydive_analyzer_install %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set skydive_analyzer_packages = ['skydive-analyzer'] %}
{{ macros.install_packages(skydive_analyzer_packages | customizable("packages")) }}
{% endif %}
{% endblock %}
{% block skydive_analyzer_footer %}{% endblock %}
{% block footer %}{% endblock %}
USER skydive

14
docker/skydive/skydive-base/Dockerfile.j2
View File

@ -7,14 +7,20 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='skydive') }}
{% if base_arch == 'x86_64' %}
{% block skydive_install %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set skydive_base_packages = ['skydive'] %}
{{ macros.install_packages(skydive_base_packages | customizable("packages")) }}
{% else %}
{% if base_arch != 'x86_64' %}
RUN echo '{{ install_type }} on {{ base_distro }} not yet available on non x86_64 platforms' \
&& /bin/false
{% else %}
RUN curl -o /usr/bin/skydive -L "https://github.com/skydive-project/skydive/releases/download/v0.18.0/skydive" \
&& chmod +x /usr/bin/skydive
{% endblock %}
{% endif %}
{% endif %}
{% endblock %}
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start