diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-21 20:04:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-21 20:04:59 +0000 |
| commit | dc2a7a006a2d66300cce7f9c8cf1ed00a79afab3 (patch) | |
| tree | c24234dc7bb16d9a4c215b70b3579a9c461a8846 /docker_templates | |
| parent | 576bdb0b76bb4555d748f479f34aa1c6da3b1a32 (diff) | |
| parent | 598fe7bad1380547fef4a4354e194da56757767d (diff) | |
| download | kolla-dc2a7a006a2d66300cce7f9c8cf1ed00a79afab3.tar.gz kolla-dc2a7a006a2d66300cce7f9c8cf1ed00a79afab3.zip | |
Merge "Add custom code to base docker templates"
Diffstat (limited to 'docker_templates')
| -rwxr-xr-x[-rw-r--r--] | docker_templates/base/Dockerfile.j2 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docker_templates/base/Dockerfile.j2 b/docker_templates/base/Dockerfile.j2 index 2c5777e7e..f1e9ecdc3 100644..100755 --- a/docker_templates/base/Dockerfile.j2 +++ b/docker_templates/base/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ base_distro }}:{{ base_distro_tag }} MAINTAINER Kolla Project (https://launchpad.net/kolla) +{{ include_header }} + {% if base_distro in ['fedora', 'centos', 'oraclelinux'] %} {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux'] %} |