diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-06 10:14:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-06 10:14:03 +0000 |
| commit | 3bd8fe8e101eceaeb366e8cd2cb4ae20ac3cb5b7 (patch) | |
| tree | d923b0b6e4e8fbf1b97a4fdcf6c4b4b336c1d878 /docker/openstack-base | |
| parent | a130ecb153f555ffd96bebf554eaa10c34a1486d (diff) | |
| parent | 69fef5cd59286b5eeaa4deaf9da97511413ed653 (diff) | |
| download | kolla-3bd8fe8e101eceaeb366e8cd2cb4ae20ac3cb5b7.tar.gz kolla-3bd8fe8e101eceaeb366e8cd2cb4ae20ac3cb5b7.zip | |
Merge "debian: enable all images enabled for Ubuntu"
Diffstat (limited to 'docker/openstack-base')
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 3d5a79cb2..9dbd6246f 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -161,7 +161,7 @@ MAINTAINER {{ maintainer }} 'sysvinit-tools', 'tcp_wrappers-libs' ] %} - {% elif base_distro in ['ubuntu'] %} + {% elif base_distro in ['debian', 'ubuntu'] %} # This will prevent questions from being asked during the install ENV DEBIAN_FRONTEND noninteractive @@ -215,7 +215,7 @@ ENV DEBIAN_FRONTEND noninteractive 'sqlite-devel', 'zip' ] %} - {% elif base_distro in ['ubuntu', 'debian'] %} + {% elif base_distro in ['debian', 'ubuntu'] %} {% set openstack_base_packages = [ 'build-essential', 'ca-certificates', |