Unverified Kaydet (Commit) b4c02393 authored tarafından Ben Firshman's avatar Ben Firshman

Remove MAINTAINER from Dockerfiles

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

(Sorry @shin- ;)
Signed-off-by: 's avatarBen Firshman <ben@firshman.co.uk>
üst c66c7f8b
FROM python:2.7 FROM python:2.7
MAINTAINER Joffrey F <joffrey@docker.com>
RUN mkdir /home/docker-py RUN mkdir /home/docker-py
WORKDIR /home/docker-py WORKDIR /home/docker-py
......
FROM python:3.5 FROM python:3.5
MAINTAINER Joffrey F <joffrey@docker.com>
RUN mkdir /home/docker-py RUN mkdir /home/docker-py
WORKDIR /home/docker-py WORKDIR /home/docker-py
......
...@@ -15,7 +15,6 @@ class BuildTest(BaseAPIIntegrationTest): ...@@ -15,7 +15,6 @@ class BuildTest(BaseAPIIntegrationTest):
def test_build_streaming(self): def test_build_streaming(self):
script = io.BytesIO('\n'.join([ script = io.BytesIO('\n'.join([
'FROM busybox', 'FROM busybox',
'MAINTAINER docker-py',
'RUN mkdir -p /tmp/test', 'RUN mkdir -p /tmp/test',
'EXPOSE 8080', 'EXPOSE 8080',
'ADD https://dl.dropboxusercontent.com/u/20637798/silence.tar.gz' 'ADD https://dl.dropboxusercontent.com/u/20637798/silence.tar.gz'
...@@ -32,7 +31,6 @@ class BuildTest(BaseAPIIntegrationTest): ...@@ -32,7 +31,6 @@ class BuildTest(BaseAPIIntegrationTest):
return return
script = io.StringIO(six.text_type('\n').join([ script = io.StringIO(six.text_type('\n').join([
'FROM busybox', 'FROM busybox',
'MAINTAINER docker-py',
'RUN mkdir -p /tmp/test', 'RUN mkdir -p /tmp/test',
'EXPOSE 8080', 'EXPOSE 8080',
'ADD https://dl.dropboxusercontent.com/u/20637798/silence.tar.gz' 'ADD https://dl.dropboxusercontent.com/u/20637798/silence.tar.gz'
...@@ -54,7 +52,6 @@ class BuildTest(BaseAPIIntegrationTest): ...@@ -54,7 +52,6 @@ class BuildTest(BaseAPIIntegrationTest):
with open(os.path.join(base_dir, 'Dockerfile'), 'w') as f: with open(os.path.join(base_dir, 'Dockerfile'), 'w') as f:
f.write("\n".join([ f.write("\n".join([
'FROM busybox', 'FROM busybox',
'MAINTAINER docker-py',
'ADD . /test', 'ADD . /test',
])) ]))
...@@ -182,7 +179,6 @@ class BuildTest(BaseAPIIntegrationTest): ...@@ -182,7 +179,6 @@ class BuildTest(BaseAPIIntegrationTest):
with open(os.path.join(base_dir, 'Dockerfile'), 'w') as f: with open(os.path.join(base_dir, 'Dockerfile'), 'w') as f:
f.write("\n".join([ f.write("\n".join([
'FROM busybox', 'FROM busybox',
'MAINTAINER docker-py',
'ADD . /test', 'ADD . /test',
])) ]))
......
...@@ -11,7 +11,6 @@ class BuildTest(BaseAPIClientTest): ...@@ -11,7 +11,6 @@ class BuildTest(BaseAPIClientTest):
def test_build_container(self): def test_build_container(self):
script = io.BytesIO('\n'.join([ script = io.BytesIO('\n'.join([
'FROM busybox', 'FROM busybox',
'MAINTAINER docker-py',
'RUN mkdir -p /tmp/test', 'RUN mkdir -p /tmp/test',
'EXPOSE 8080', 'EXPOSE 8080',
'ADD https://dl.dropboxusercontent.com/u/20637798/silence.tar.gz' 'ADD https://dl.dropboxusercontent.com/u/20637798/silence.tar.gz'
...@@ -23,7 +22,6 @@ class BuildTest(BaseAPIClientTest): ...@@ -23,7 +22,6 @@ class BuildTest(BaseAPIClientTest):
def test_build_container_pull(self): def test_build_container_pull(self):
script = io.BytesIO('\n'.join([ script = io.BytesIO('\n'.join([
'FROM busybox', 'FROM busybox',
'MAINTAINER docker-py',
'RUN mkdir -p /tmp/test', 'RUN mkdir -p /tmp/test',
'EXPOSE 8080', 'EXPOSE 8080',
'ADD https://dl.dropboxusercontent.com/u/20637798/silence.tar.gz' 'ADD https://dl.dropboxusercontent.com/u/20637798/silence.tar.gz'
...@@ -35,7 +33,6 @@ class BuildTest(BaseAPIClientTest): ...@@ -35,7 +33,6 @@ class BuildTest(BaseAPIClientTest):
def test_build_container_stream(self): def test_build_container_stream(self):
script = io.BytesIO('\n'.join([ script = io.BytesIO('\n'.join([
'FROM busybox', 'FROM busybox',
'MAINTAINER docker-py',
'RUN mkdir -p /tmp/test', 'RUN mkdir -p /tmp/test',
'EXPOSE 8080', 'EXPOSE 8080',
'ADD https://dl.dropboxusercontent.com/u/20637798/silence.tar.gz' 'ADD https://dl.dropboxusercontent.com/u/20637798/silence.tar.gz'
...@@ -47,7 +44,6 @@ class BuildTest(BaseAPIClientTest): ...@@ -47,7 +44,6 @@ class BuildTest(BaseAPIClientTest):
def test_build_container_custom_context(self): def test_build_container_custom_context(self):
script = io.BytesIO('\n'.join([ script = io.BytesIO('\n'.join([
'FROM busybox', 'FROM busybox',
'MAINTAINER docker-py',
'RUN mkdir -p /tmp/test', 'RUN mkdir -p /tmp/test',
'EXPOSE 8080', 'EXPOSE 8080',
'ADD https://dl.dropboxusercontent.com/u/20637798/silence.tar.gz' 'ADD https://dl.dropboxusercontent.com/u/20637798/silence.tar.gz'
...@@ -60,7 +56,6 @@ class BuildTest(BaseAPIClientTest): ...@@ -60,7 +56,6 @@ class BuildTest(BaseAPIClientTest):
def test_build_container_custom_context_gzip(self): def test_build_container_custom_context_gzip(self):
script = io.BytesIO('\n'.join([ script = io.BytesIO('\n'.join([
'FROM busybox', 'FROM busybox',
'MAINTAINER docker-py',
'RUN mkdir -p /tmp/test', 'RUN mkdir -p /tmp/test',
'EXPOSE 8080', 'EXPOSE 8080',
'ADD https://dl.dropboxusercontent.com/u/20637798/silence.tar.gz' 'ADD https://dl.dropboxusercontent.com/u/20637798/silence.tar.gz'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment