Merge pull request #863 from cglewis/master

MAINTAINER is deprecated, using LABEL now
flannel-io · Nov 2, 2017 · 6fff60c · 6fff60c
2 parents 2bc97a5 + a8abf83
commit 6fff60c
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/Dockerfile.amd64 b/Dockerfile.amd64
@@ -1,6 +1,6 @@
 FROM frolvlad/alpine-glibc
 
-MAINTAINER Tom Denham <tom@tigera.io>
+LABEL maintainer="Tom Denham <tom@tigera.io>"
 
 ENV FLANNEL_ARCH=amd64
 

diff --git a/Dockerfile.arm b/Dockerfile.arm
@@ -1,6 +1,6 @@
 FROM arm32v7/busybox:glibc
 
-MAINTAINER Tom Denham <tom@tigera.io>
+LABEL maintainer="Tom Denham <tom@tigera.io>"
 
 ENV FLANNEL_ARCH=arm
 

diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
@@ -1,6 +1,6 @@
 FROM arm64v8/busybox:glibc
 
-MAINTAINER Tom Denham <tom@tigera.io>
+LABEL maintainer="Tom Denham <tom@tigera.io>"
 
 ENV FLANNEL_ARCH=arm64
 

diff --git a/Dockerfile.ppc64le b/Dockerfile.ppc64le
@@ -1,6 +1,6 @@
 FROM ppc64le/busybox:glibc
 
-MAINTAINER Tom Denham <tom@tigera.io>
+LABEL maintainer="Tom Denham <tom@tigera.io>"
 
 ENV FLANNEL_ARCH=ppc64le
 

diff --git a/Dockerfile.s390x b/Dockerfile.s390x
@@ -1,6 +1,6 @@
 FROM s390x/busybox:glibc
 
-MAINTAINER Tom Denham <tom@tigera.io>
+LABEL maintainer="Tom Denham <tom@tigera.io>"
 
 ENV FLANNEL_ARCH=s390x