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/bifrost/bifrost-base/Dockerfile.j2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docker/bifrost') diff --git a/docker/bifrost/bifrost-base/Dockerfile.j2 b/docker/bifrost/bifrost-base/Dockerfile.j2 index 4bd96f977..6a96fdd45 100644 --- a/docker/bifrost/bifrost-base/Dockerfile.j2 +++ b/docker/bifrost/bifrost-base/Dockerfile.j2 @@ -26,17 +26,17 @@ RUN ln -s bifrost-base-source/* bifrost \ WORKDIR /bifrost -{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} +{% if base_package_type == 'rpm' %} {# Remove updated RabbitMQ packages since these are not supported by Bifrost yet. #} RUN rm -f /etc/yum.repos.d/rabbitmq_rabbitmq-server.repo \ && yum clean all && rm -rf /var/yum/cache -{% elif base_distro in ['debian', 'ubuntu'] %} +{% elif base_package_type == 'deb' %} RUN sed -e "s/.*mariadb.*//Ig" -e "s/.*rabbitmq.*//Ig" -i /etc/apt/sources.list \ && apt-get purge -y mariadb* mysql* {% endif %} {% block bifrost_ansible_install %} -{% if base_distro in ['debian', 'ubuntu'] %} +{% if base_package_type == 'deb' %} RUN apt-get update && \ {% else %} RUN echo " " && \ @@ -44,7 +44,7 @@ RUN echo " " && \ bash -c './scripts/env-setup.sh && source ./env-vars && \ ansible-playbook -vvvv -i /bifrost/playbooks/inventory/target /bifrost/playbooks/install.yaml \ -e @/tmp/build_arg.yml && \ -{% if base_distro in ['debian', 'ubuntu'] %} +{% if base_package_type == 'deb' %} apt-get clean && rm -rf /var/lib/apt/lists/*' {% else %} yum clean all && rm -rf /var/yum/cache' -- cgit v1.2.3