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/dind/Dockerfile.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker/dind') diff --git a/docker/dind/Dockerfile.j2 b/docker/dind/Dockerfile.j2 index 4daa70e32..cef161c67 100644 --- a/docker/dind/Dockerfile.j2 +++ b/docker/dind/Dockerfile.j2 @@ -12,7 +12,7 @@ MAINTAINER {{ maintainer }} # the centos gate and we want to do multinode we can populate this container RUN /bin/true -{% elif base_distro in ['ubuntu', 'debian'] %} +{% elif base_distro in ['debian', 'ubuntu'] %} {% set dind_packages = [ 'btrfs-tools', 'docker-engine', -- cgit v1.2.3