From ae1322ec10861678abe1137f3013030b34335bc7 Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Tue, 15 Jan 2019 16:58:25 -0700
Subject: Use base_package_type

This change updates the docker files to use base_package_type instead
of doing specific distro checks for the rhel/deb generic cases. The
base_distro is still available and is used when a specific distro needs
a customization but if the differences are purely rpm vs deb, then the
base_package_type can be used.

Change-Id: I8d720bb185df65a0178061ccf20b1ab2265da2c5
---
 docker/skydive/skydive-agent/Dockerfile.j2    | 4 ++--
 docker/skydive/skydive-analyzer/Dockerfile.j2 | 2 +-
 docker/skydive/skydive-base/Dockerfile.j2     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'docker/skydive')

diff --git a/docker/skydive/skydive-agent/Dockerfile.j2 b/docker/skydive/skydive-agent/Dockerfile.j2
index 35862deee..87a1729f9 100644
--- a/docker/skydive/skydive-agent/Dockerfile.j2
+++ b/docker/skydive/skydive-agent/Dockerfile.j2
@@ -6,12 +6,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% import "macros.j2" as macros with context %}
 
 {% block skydive_agent_install %}
-{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+{% if base_package_type == 'rpm' %}
     {% set skydive_agent_packages = [
         'openvswitch',
         'skydive-agent'
     ] %}
-{% elif base_distro in ['debian', 'ubuntu'] %}
+{% elif base_package_type == 'deb' %}
     {% set skydive_agent_packages = ['openvswitch-common'] %}
 {% endif %}
 {{ macros.install_packages(skydive_agent_packages | customizable("packages")) }}
diff --git a/docker/skydive/skydive-analyzer/Dockerfile.j2 b/docker/skydive/skydive-analyzer/Dockerfile.j2
index a81a92cfa..776ddbca5 100644
--- a/docker/skydive/skydive-analyzer/Dockerfile.j2
+++ b/docker/skydive/skydive-analyzer/Dockerfile.j2
@@ -6,7 +6,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% import "macros.j2" as macros with context %}
 
 {% block skydive_analyzer_install %}
-{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+{% if base_package_type == 'rpm' %}
     {% set skydive_analyzer_packages = ['skydive-analyzer'] %}
 {{ macros.install_packages(skydive_analyzer_packages | customizable("packages")) }}
 {% endif %}
diff --git a/docker/skydive/skydive-base/Dockerfile.j2 b/docker/skydive/skydive-base/Dockerfile.j2
index 814b1dde3..9bd602d86 100644
--- a/docker/skydive/skydive-base/Dockerfile.j2
+++ b/docker/skydive/skydive-base/Dockerfile.j2
@@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.configure_user(name='skydive') }}
 
 {% block skydive_install %}
-{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+{% if base_package_type == 'rpm' %}
     {% set skydive_base_packages = ['skydive'] %}
 {{ macros.install_packages(skydive_base_packages | customizable("packages")) }}
 {% else %}
-- 
cgit v1.2.3