From 69fef5cd59286b5eeaa4deaf9da97511413ed653 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Sun, 12 Feb 2017 18:36:51 +0100 Subject: debian: enable all images enabled for Ubuntu Debian support is not maintained in Kolla so it got a bit behind Ubuntu one. This changeset enables Debian for all images. Jessie (even with backports) may be too old for some images though. Also unify distro check to ['debian', 'ubuntu'] to keep alphabetical order like it is done for RPM distributions. Partially-Implements: blueprint multiarch-and-arm64-containers Change-Id: I056233fbfa277e0e2360c07c3f80d9558c554357 --- docker/rabbitmq/Dockerfile.j2 | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'docker/rabbitmq') diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index e5bcb6223..711dbd23e 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -14,7 +14,7 @@ MAINTAINER {{ maintainer }} 'rabbitmq-server' ] %} -{% elif base_distro == 'ubuntu' %} +{% elif base_distro in ['debian', 'ubuntu'] %} {% set rabbitmq_packages = [ 'erlang-nox', 'http://www.rabbitmq.com/releases/rabbitmq-server/v3.6.5/rabbitmq-server_3.6.5-1_all.deb', @@ -22,12 +22,6 @@ MAINTAINER {{ maintainer }} 'socat' ] %} -{% elif base_distro == 'debian' %} - {% set rabbitmq_packages = [ - 'erlang-nox', - 'http://www.rabbitmq.com/releases/rabbitmq-server/v3.6.5/rabbitmq-server_3.6.5-1_all.deb' - ] %} - {% endif %} {{ macros.install_packages(rabbitmq_packages | customizable("packages")) }} -- cgit v1.2.3