openstack
/
kolla
Code Issues Proposed changes

Merged multiple ENV into a single layer 

There are multiple ENV calls which create multiple unnecessary
layers, this patch merges them into a single layer.

Change-Id: Icf40033b03a61abbcdcbf72fe8f8137d1a12d2b5
This commit is contained in:
Mohammed Naser 2017-03-23 20:25:17 -04:00
parent 2cf58e2c12
commit e7774b70d3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/base/Dockerfile.j2
View File

@ -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/

6
docker/helm-repository/Dockerfile.j2
View File

@ -2,9 +2,9 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
MAINTAINER {{ maintainer }}
{% block helm_repository_version %}
ENV helm_version 2.1.3
ENV helm_port 8879
ENV helm_address 0.0.0.0
ENV helm_version=2.1.3 \
helm_port=8879 \
helm_address=0.0.0.0
{% endblock %}
{% block helm_repository_header %}{% endblock %}