From 8c463a47a9c988df70046f7d343af0441bf29f4d Mon Sep 17 00:00:00 2001
From: Chen <dstbtgagt@foxmail.com>
Date: Tue, 18 Apr 2017 17:20:03 +0900
Subject: 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
---
 docker/openvswitch/openvswitch-base/Dockerfile.j2      | 2 +-
 docker/openvswitch/openvswitch-db-server/Dockerfile.j2 | 2 +-
 docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'docker/openvswitch')

diff --git a/docker/openvswitch/openvswitch-base/Dockerfile.j2 b/docker/openvswitch/openvswitch-base/Dockerfile.j2
index 60e4d8a62..dcb4278aa 100644
--- a/docker/openvswitch/openvswitch-base/Dockerfile.j2
+++ b/docker/openvswitch/openvswitch-base/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
-MAINTAINER {{ maintainer }}
+LABEL maintainer="{{ maintainer }}"
 
 {% block openvswitch_base_header %}{% endblock %}
 
diff --git a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2
index 1b23732d6..191b2360c 100644
--- a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2
+++ b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }}
-MAINTAINER {{ maintainer }}
+LABEL maintainer="{{ maintainer }}"
 
 {% block openvswitch_db_server_header %}{% endblock %}
 
diff --git a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2
index 19535d0b1..618848f62 100644
--- a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2
+++ b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2
@@ -1,5 +1,5 @@
 FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }}
-MAINTAINER {{ maintainer }}
+LABEL maintainer="{{ maintainer }}"
 
 {% block openvswitch_vswitchd_header %}{% endblock %}
 
-- 
cgit v1.2.3