diff options
| author | Steven Dake <stdake@cisco.com> | 2015-08-15 12:43:08 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-08-15 12:44:48 -0700 |
| commit | f16e3524741f5a82debecd5a90013914beaeb109 (patch) | |
| tree | 164be7a1514263a7cbf77ccce1834488ce0e7157 | |
| parent | c790fb6c6af3bd1ecac30732f05458e01b241dee (diff) | |
| download | kolla-f16e3524741f5a82debecd5a90013914beaeb109.tar.gz kolla-f16e3524741f5a82debecd5a90013914beaeb109.zip | |
Fix up FROM line in galera
While the existing FROM line is technically correct, prefer we
use jinja tmeplating for the whole thing, so that we can remove
the special casing of the build.py script once the docker dir
goes.
Change-Id: I27efcd55f1b45d32e4504734edf9e1a305696ac1
Partially-Implements: blueprint dockerfile-templates
| -rw-r--r-- | docker_templates/galera/Dockerfile.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker_templates/galera/Dockerfile.j2 b/docker_templates/galera/Dockerfile.j2 index 3b8611ae7..90975ddab 100644 --- a/docker_templates/galera/Dockerfile.j2 +++ b/docker_templates/galera/Dockerfile.j2 @@ -1,4 +1,4 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% +FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} |