aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-08-16 03:38:11 +0000
committerGerrit Code Review <review@openstack.org>2015-08-16 03:38:11 +0000
commit0f38e25c1b031743e10651df4d718e202e703e18 (patch)
tree3fc1b04d25d348f4fec8bf045ac6050890be6566
parentcec94cb13003b8152e01c0f43c1f8d0fd91ba89d (diff)
parentf16e3524741f5a82debecd5a90013914beaeb109 (diff)
downloadkolla-0f38e25c1b031743e10651df4d718e202e703e18.tar.gz
kolla-0f38e25c1b031743e10651df4d718e202e703e18.zip
Merge "Fix up FROM line in galera"
-rw-r--r--docker_templates/galera/Dockerfile.j22
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'] %}