diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-05-09 09:32:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-05-09 09:32:53 +0000 |
| commit | 17e6684c1a42b999e6b213826ecf4499329de131 (patch) | |
| tree | 8c5c9201e55fa119a6c61d89df640f49d2e9135e /docker | |
| parent | b1e0ce0d3899a28a3ad2f7443720cd9c71d4757b (diff) | |
| parent | 070bf258357c85a7b4411dc97f75df7d19e9792c (diff) | |
| download | kolla-17e6684c1a42b999e6b213826ecf4499329de131.tar.gz kolla-17e6684c1a42b999e6b213826ecf4499329de131.zip | |
Merge "Support a custom base image"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 5cf3633c0..47d90ab6a 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM {{ base_distro }}:{{ base_distro_tag }} +FROM {{ base_image }}:{{ base_distro_tag }} MAINTAINER {{ maintainer }} LABEL kolla_version="{{ kolla_version }}" |