Browse Source

Merge "skydive: use packages on rpm based distros"

tags/7.0.0.0rc1
Zuul 9 months ago
parent
commit
5b73ed78ba

+ 4
- 1
docker/skydive/skydive-agent/Dockerfile.j2 View File

@@ -7,7 +7,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
7 7
 
8 8
 {% block skydive_agent_install %}
9 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 14
 {% elif base_distro in ['debian', 'ubuntu'] %}
12 15
     {% set skydive_agent_packages = ['openvswitch-common'] %}
13 16
 {% endif %}

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

@@ -2,7 +2,18 @@ FROM {{ namespace }}/{{ image_prefix }}skydive-base:{{ tag }}
2 2
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
3 3
 
4 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 15
 {% block skydive_analyzer_footer %}{% endblock %}
16
+
6 17
 {% block footer %}{% endblock %}
7 18
 
8 19
 USER skydive

+ 10
- 4
docker/skydive/skydive-base/Dockerfile.j2 View File

@@ -7,14 +7,20 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
7 7
 
8 8
 {{ macros.configure_user(name='skydive') }}
9 9
 
10
-{% if base_arch == 'x86_64' %}
11
-
12 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' %}
16
+RUN echo '{{ install_type }} on {{ base_distro }} not yet available on non x86_64 platforms' \
17
+    && /bin/false
18
+    {% else %}
13 19
 RUN curl -o /usr/bin/skydive -L "https://github.com/skydive-project/skydive/releases/download/v0.18.0/skydive" \
14 20
     && chmod +x /usr/bin/skydive
15
-{% endblock %}
16
-
21
+    {% endif %}
17 22
 {% endif %}
23
+{% endblock %}
18 24
 
19 25
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
20 26
 RUN chmod 755 /usr/local/bin/kolla_extend_start

Loading…
Cancel
Save