From f16e3524741f5a82debecd5a90013914beaeb109 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Sat, 15 Aug 2015 12:43:08 -0700 Subject: [PATCH] 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 --- docker_templates/galera/Dockerfile.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker_templates/galera/Dockerfile.j2 b/docker_templates/galera/Dockerfile.j2 index 3b8611ae78..90975ddabe 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'] %}