diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-03-25 00:51:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-03-25 00:51:10 +0000 |
| commit | 13ec42e2a93be480a0aba75fbd8b12d3e9ed027a (patch) | |
| tree | fa685dfa59641c53b472919c347c85f5edf48977 /docker/base | |
| parent | f94b89773522df097367e77d47d06b33be52b9c2 (diff) | |
| parent | e7774b70d3ea9e19a74753e1cb8175ecc56ba06d (diff) | |
| download | kolla-13ec42e2a93be480a0aba75fbd8b12d3e9ed027a.tar.gz kolla-13ec42e2a93be480a0aba75fbd8b12d3e9ed027a.zip | |
Merge "Merged multiple ENV into a single layer"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index f8eedbcf7..501d5cbfb 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -15,9 +15,9 @@ LABEL kolla_version="{{ kolla_version }}" {% import "macros.j2" as macros with context %} {% block base_header %}{% endblock %} -ENV KOLLA_BASE_DISTRO {{ base_distro }} -ENV KOLLA_INSTALL_TYPE {{ install_type }} -ENV KOLLA_INSTALL_METATYPE {{ install_metatype }} +ENV KOLLA_BASE_DISTRO={{ base_distro }} \ + KOLLA_INSTALL_TYPE={{ install_type }} \ + KOLLA_INSTALL_METATYPE={{ install_metatype }} #### Customize PS1 to be used with bash shell COPY kolla_bashrc /tmp/ |