From ae1322ec10861678abe1137f3013030b34335bc7 Mon Sep 17 00:00:00 2001 From: Alex Schultz 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/crane/Dockerfile.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docker/crane') diff --git a/docker/crane/Dockerfile.j2 b/docker/crane/Dockerfile.j2 index c9fa12af2..aea3f301f 100644 --- a/docker/crane/Dockerfile.j2 +++ b/docker/crane/Dockerfile.j2 @@ -26,7 +26,7 @@ RUN echo 'crane not yet available for {{ base_distro }}' && /bin/false {% endif %} {% elif install_type == 'source' %} - {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% if base_package_type == 'rpm' %} {% set crane_packages = [ 'httpd', 'mod_ssl', @@ -40,7 +40,7 @@ RUN echo 'crane not yet available for {{ base_distro }}' && /bin/false RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf - {% elif base_distro in ['debian', 'ubuntu'] %} + {% elif base_package_type == 'deb' %} RUN echo 'crane not yet available for {{ base_distro }}' && /bin/false {% endif %} -- cgit v1.2.3