aboutsummaryrefslogtreecommitdiff
path: root/docker/heat
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-20 12:32:55 +0000
committerGerrit Code Review <review@openstack.org>2017-04-20 12:32:55 +0000
commitb9e320a7cd23c282494f25ce1c0427dd6201b9b6 (patch)
tree54ce933ba2259d22f9d8ac0c8c7efbc0437a23c6 /docker/heat
parent723790fc9f84c130debd0af658471a70b459fd65 (diff)
parent8c463a47a9c988df70046f7d343af0441bf29f4d (diff)
downloadkolla-b9e320a7cd23c282494f25ce1c0427dd6201b9b6.tar.gz
kolla-b9e320a7cd23c282494f25ce1c0427dd6201b9b6.zip
Merge "Use LABEL instead of MAINTAINER (deprecated) in all Dockerfile.j2"
Diffstat (limited to 'docker/heat')
-rw-r--r--docker/heat/heat-all/Dockerfile.j22
-rw-r--r--docker/heat/heat-api-cfn/Dockerfile.j22
-rw-r--r--docker/heat/heat-api-cloudwatch/Dockerfile.j22
-rw-r--r--docker/heat/heat-api/Dockerfile.j22
-rw-r--r--docker/heat/heat-base/Dockerfile.j22
-rw-r--r--docker/heat/heat-engine/Dockerfile.j22
6 files changed, 6 insertions, 6 deletions
diff --git a/docker/heat/heat-all/Dockerfile.j2 b/docker/heat/heat-all/Dockerfile.j2
index 9acb73965..afe73dc5b 100644
--- a/docker/heat/heat-all/Dockerfile.j2
+++ b/docker/heat/heat-all/Dockerfile.j2
@@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }}
-MAINTAINER {{ maintainer }}
+LABEL maintainer="{{ maintainer }}"
{% block heat_all_header %}{% endblock %}
diff --git a/docker/heat/heat-api-cfn/Dockerfile.j2 b/docker/heat/heat-api-cfn/Dockerfile.j2
index 7ea7318e7..c3567080f 100644
--- a/docker/heat/heat-api-cfn/Dockerfile.j2
+++ b/docker/heat/heat-api-cfn/Dockerfile.j2
@@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }}
-MAINTAINER {{ maintainer }}
+LABEL maintainer="{{ maintainer }}"
{% block heat_api_cfn_header %}{% endblock %}
diff --git a/docker/heat/heat-api-cloudwatch/Dockerfile.j2 b/docker/heat/heat-api-cloudwatch/Dockerfile.j2
index 3c3d2ccf0..a168c8726 100644
--- a/docker/heat/heat-api-cloudwatch/Dockerfile.j2
+++ b/docker/heat/heat-api-cloudwatch/Dockerfile.j2
@@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }}
-MAINTAINER {{ maintainer }}
+LABEL maintainer="{{ maintainer }}"
{% block heat_api_cloudwatch_header %}{% endblock %}
diff --git a/docker/heat/heat-api/Dockerfile.j2 b/docker/heat/heat-api/Dockerfile.j2
index e021ad02d..7a7de552f 100644
--- a/docker/heat/heat-api/Dockerfile.j2
+++ b/docker/heat/heat-api/Dockerfile.j2
@@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }}
-MAINTAINER {{ maintainer }}
+LABEL maintainer="{{ maintainer }}"
{% block heat_api_header %}{% endblock %}
diff --git a/docker/heat/heat-base/Dockerfile.j2 b/docker/heat/heat-base/Dockerfile.j2
index 3b900fa18..de3660f62 100644
--- a/docker/heat/heat-base/Dockerfile.j2
+++ b/docker/heat/heat-base/Dockerfile.j2
@@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-MAINTAINER {{ maintainer }}
+LABEL maintainer="{{ maintainer }}"
{% block heat_base_header %}{% endblock %}
diff --git a/docker/heat/heat-engine/Dockerfile.j2 b/docker/heat/heat-engine/Dockerfile.j2
index 7b753df65..0b4fc5fbf 100644
--- a/docker/heat/heat-engine/Dockerfile.j2
+++ b/docker/heat/heat-engine/Dockerfile.j2
@@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }}
-MAINTAINER {{ maintainer }}
+LABEL maintainer="{{ maintainer }}"
{% block heat_engine_header %}{% endblock %}