aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docker/base/Dockerfile.j26
-rw-r--r--docker/helm-repository/Dockerfile.j26
2 files changed, 6 insertions, 6 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/
diff --git a/docker/helm-repository/Dockerfile.j2 b/docker/helm-repository/Dockerfile.j2
index f99e41c10..25e087fc1 100644
--- a/docker/helm-repository/Dockerfile.j2
+++ b/docker/helm-repository/Dockerfile.j2
@@ -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 %}