summaryrefslogtreecommitdiff
path: root/docker/kuryr
diff options
context:
space:
mode:
authorChen <dstbtgagt@foxmail.com>2017-04-18 17:20:03 +0900
committerChen <dstbtgagt@foxmail.com>2017-04-20 16:50:05 +0900
commit8c463a47a9c988df70046f7d343af0441bf29f4d (patch)
tree7d8c02b341152be4b843df788af4b3c50e200f1b /docker/kuryr
parentbf84c20e8f7b9eed03275ece9d492492e2c00c62 (diff)
downloadkolla-8c463a47a9c988df70046f7d343af0441bf29f4d.tar.gz
kolla-8c463a47a9c988df70046f7d343af0441bf29f4d.zip
Use LABEL instead of MAINTAINER (deprecated) in all Dockerfile.j2
Use LABEL instruction instead of MAINTAINER (deprecated) instruc- tion as suggested by Docker's official dockerfile guide. docs.docker.com/engine/reference/builder/#maintainer-deprecated Closes-Bug: #1683652 Change-Id: Ie87a1ddf31aefcd0b623fd2837d78de420e76898
Diffstat (limited to 'docker/kuryr')
-rw-r--r--docker/kuryr/kuryr-base/Dockerfile.j22
-rw-r--r--docker/kuryr/kuryr-libnetwork/Dockerfile.j22
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/kuryr/kuryr-base/Dockerfile.j2 b/docker/kuryr/kuryr-base/Dockerfile.j2
index 5911d343e..375ab4c86 100644
--- a/docker/kuryr/kuryr-base/Dockerfile.j2
+++ b/docker/kuryr/kuryr-base/Dockerfile.j2
@@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
-MAINTAINER {{ maintainer }}
+LABEL maintainer="{{ maintainer }}"
{% block kuryr_base_header %}{% endblock %}
diff --git a/docker/kuryr/kuryr-libnetwork/Dockerfile.j2 b/docker/kuryr/kuryr-libnetwork/Dockerfile.j2
index b153451c6..808dcccd7 100644
--- a/docker/kuryr/kuryr-libnetwork/Dockerfile.j2
+++ b/docker/kuryr/kuryr-libnetwork/Dockerfile.j2
@@ -1,5 +1,5 @@
FROM {{ namespace }}/{{ image_prefix }}kuryr-base:{{ tag }}
-MAINTAINER {{ maintainer }}
+LABEL maintainer="{{ maintainer }}"
{% block kuryr_libnetwork_header %}{% endblock %}