From 070bf258357c85a7b4411dc97f75df7d19e9792c Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <jeffrey.zhang@99cloud.net>
Date: Fri, 6 May 2016 17:30:47 +0800
Subject: Support a custom base image

Add a new option(base-image) to support custom base image
In default, the base-image is equal to base. When using custom
image, please use command line like:

    ./tool/build.py --base-image my-image --base centos --base-tag 0.1

DocImpact

Closes-Bug: #1573544
Change-Id: If4b9c57a2b68f6f06d3e981f30b2173064e02193
---
 docker/base/Dockerfile.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docker')

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 }}"
-- 
cgit v1.2.3