aboutsummaryrefslogtreecommitdiff
path: root/kolla
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-08-28 11:24:21 +0000
committerGerrit Code Review <review@openstack.org>2015-08-28 11:24:22 +0000
commit2de7b141d25d360edf6833b8a0d8440413812eb6 (patch)
treeb8584fdaf95eab6752e1d9de953dc2f873c56345 /kolla
parentf895ee07cc5c1030e32854cf9a4e91bbeaf4de12 (diff)
parent630f437576c81c829f6d74cc33dcf830bbc89bef (diff)
downloadkolla-2de7b141d25d360edf6833b8a0d8440413812eb6.tar.gz
kolla-2de7b141d25d360edf6833b8a0d8440413812eb6.zip
Merge "Add custom footer section to final image Dockefiles"
Diffstat (limited to 'kolla')
-rwxr-xr-xkolla/cmd/build.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/kolla/cmd/build.py b/kolla/cmd/build.py
index d94d8b29b..d3842d581 100755
--- a/kolla/cmd/build.py
+++ b/kolla/cmd/build.py
@@ -249,6 +249,10 @@ def arg_parser():
help=('Path to custom file to be added at '
'beginning of base Dockerfile'),
type=str)
+ parser.add_argument('-I', '--include-footer',
+ help=('Path to custom file to be added at '
+ 'end of Dockerfiles for final images'),
+ type=str)
return vars(parser.parse_args())
@@ -281,6 +285,7 @@ class KollaWorker(object):
self.config = ConfigParser.SafeConfigParser()
self.config.read(os.path.join(self.base_dir, 'build.ini'))
self.include_header = args['include_header']
+ self.include_footer = args['include_footer']
self.regex = args['regex']
self.image_statuses_bad = dict()
@@ -320,6 +325,9 @@ class KollaWorker(object):
if self.include_header:
with open(self.include_header, 'r') as f:
values['include_header'] = f.read()
+ if self.include_footer:
+ with open(self.include_footer, 'r') as f:
+ values['include_footer'] = f.read()
content = template.render(values)
with open(os.path.join(path, 'Dockerfile'), 'w') as f:
f.write(content)