From b4c02393b2773bddb212a24ded85d805bdca8334 Mon Sep 17 00:00:00 2001
From: Ben Firshman <ben@firshman.co.uk>
Date: Thu, 24 Nov 2016 13:32:20 +0000
Subject: [PATCH] Remove MAINTAINER from Dockerfiles

It was deprecated in https://github.com/docker/docker/pull/25466

(Sorry @shin- ;)

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
---
 Dockerfile                          | 1 -
 Dockerfile-py3                      | 1 -
 tests/integration/api_build_test.py | 4 ----
 tests/unit/api_build_test.py        | 5 -----
 4 files changed, 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 012a1259..993ac012 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,4 @@
 FROM python:2.7
-MAINTAINER Joffrey F <joffrey@docker.com>
 
 RUN mkdir /home/docker-py
 WORKDIR /home/docker-py
diff --git a/Dockerfile-py3 b/Dockerfile-py3
index 21e713bb..c7466517 100644
--- a/Dockerfile-py3
+++ b/Dockerfile-py3
@@ -1,5 +1,4 @@
 FROM python:3.5
-MAINTAINER Joffrey F <joffrey@docker.com>
 
 RUN mkdir /home/docker-py
 WORKDIR /home/docker-py
diff --git a/tests/integration/api_build_test.py b/tests/integration/api_build_test.py
index 9ae74f4d..3dac0e93 100644
--- a/tests/integration/api_build_test.py
+++ b/tests/integration/api_build_test.py
@@ -15,7 +15,6 @@ class BuildTest(BaseAPIIntegrationTest):
     def test_build_streaming(self):
         script = io.BytesIO('\n'.join([
             'FROM busybox',
-            'MAINTAINER docker-py',
             'RUN mkdir -p /tmp/test',
             'EXPOSE 8080',
             'ADD https://dl.dropboxusercontent.com/u/20637798/silence.tar.gz'
@@ -32,7 +31,6 @@ class BuildTest(BaseAPIIntegrationTest):
             return
         script = io.StringIO(six.text_type('\n').join([
             'FROM busybox',
-            'MAINTAINER docker-py',
             'RUN mkdir -p /tmp/test',
             'EXPOSE 8080',
             'ADD https://dl.dropboxusercontent.com/u/20637798/silence.tar.gz'
@@ -54,7 +52,6 @@ class BuildTest(BaseAPIIntegrationTest):
         with open(os.path.join(base_dir, 'Dockerfile'), 'w') as f:
             f.write("\n".join([
                 'FROM busybox',
-                'MAINTAINER docker-py',
                 'ADD . /test',
             ]))
 
@@ -182,7 +179,6 @@ class BuildTest(BaseAPIIntegrationTest):
         with open(os.path.join(base_dir, 'Dockerfile'), 'w') as f:
             f.write("\n".join([
                 'FROM busybox',
-                'MAINTAINER docker-py',
                 'ADD . /test',
             ]))
 
diff --git a/tests/unit/api_build_test.py b/tests/unit/api_build_test.py
index 8146fee7..927aa974 100644
--- a/tests/unit/api_build_test.py
+++ b/tests/unit/api_build_test.py
@@ -11,7 +11,6 @@ class BuildTest(BaseAPIClientTest):
     def test_build_container(self):
         script = io.BytesIO('\n'.join([
             'FROM busybox',
-            'MAINTAINER docker-py',
             'RUN mkdir -p /tmp/test',
             'EXPOSE 8080',
             'ADD https://dl.dropboxusercontent.com/u/20637798/silence.tar.gz'
@@ -23,7 +22,6 @@ class BuildTest(BaseAPIClientTest):
     def test_build_container_pull(self):
         script = io.BytesIO('\n'.join([
             'FROM busybox',
-            'MAINTAINER docker-py',
             'RUN mkdir -p /tmp/test',
             'EXPOSE 8080',
             'ADD https://dl.dropboxusercontent.com/u/20637798/silence.tar.gz'
@@ -35,7 +33,6 @@ class BuildTest(BaseAPIClientTest):
     def test_build_container_stream(self):
         script = io.BytesIO('\n'.join([
             'FROM busybox',
-            'MAINTAINER docker-py',
             'RUN mkdir -p /tmp/test',
             'EXPOSE 8080',
             'ADD https://dl.dropboxusercontent.com/u/20637798/silence.tar.gz'
@@ -47,7 +44,6 @@ class BuildTest(BaseAPIClientTest):
     def test_build_container_custom_context(self):
         script = io.BytesIO('\n'.join([
             'FROM busybox',
-            'MAINTAINER docker-py',
             'RUN mkdir -p /tmp/test',
             'EXPOSE 8080',
             'ADD https://dl.dropboxusercontent.com/u/20637798/silence.tar.gz'
@@ -60,7 +56,6 @@ class BuildTest(BaseAPIClientTest):
     def test_build_container_custom_context_gzip(self):
         script = io.BytesIO('\n'.join([
             'FROM busybox',
-            'MAINTAINER docker-py',
             'RUN mkdir -p /tmp/test',
             'EXPOSE 8080',
             'ADD https://dl.dropboxusercontent.com/u/20637798/silence.tar.gz'