Skip to content

Commit 85ada88

Browse files
MichaelPereiraMisty Stanley-Jones
authored and
Misty Stanley-Jones
committed
Replace deprecated MAINTAINER with LABEL (docker#1445)
Replace MAINTAINER instruction with LABEL as MAINTAINER was deprecated in moby/moby#25466
1 parent 2f4c941 commit 85ada88

18 files changed

+5
-30
lines changed

docker-hub/webhooks.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ example webhook below generates an HTTP POST that delivers a JSON payload:
2828
"comment_count": "0",
2929
"date_created": 1.417494799e+09,
3030
"description": "",
31-
"dockerfile": "#\n# BUILD\u0009\u0009docker build -t svendowideit/apt-cacher .\n# RUN\u0009\u0009docker run -d -p 3142:3142 -name apt-cacher-run apt-cacher\n#\n# and then you can run containers with:\n# \u0009\u0009docker run -t -i -rm -e http_proxy http://192.168.1.2:3142/ debian bash\n#\nFROM\u0009\u0009ubuntu\nMAINTAINER\u0009[email protected]\n\n\nVOLUME\u0009\u0009[\/var/cache/apt-cacher-ng\]\nRUN\u0009\u0009apt-get update ; apt-get install -yq apt-cacher-ng\n\nEXPOSE \u0009\u00093142\nCMD\u0009\u0009chmod 777 /var/cache/apt-cacher-ng ; /etc/init.d/apt-cacher-ng start ; tail -f /var/log/apt-cacher-ng/*\n",
31+
"dockerfile": "#\n# BUILD\u0009\u0009docker build -t svendowideit/apt-cacher .\n# RUN\u0009\u0009docker run -d -p 3142:3142 -name apt-cacher-run apt-cacher\n#\n# and then you can run containers with:\n# \u0009\u0009docker run -t -i -rm -e http_proxy http://192.168.1.2:3142/ debian bash\n#\nFROM\u0009\u0009ubuntu\n\n\nVOLUME\u0009\u0009[\/var/cache/apt-cacher-ng\]\nRUN\u0009\u0009apt-get update ; apt-get install -yq apt-cacher-ng\n\nEXPOSE \u0009\u00093142\nCMD\u0009\u0009chmod 777 /var/cache/apt-cacher-ng ; /etc/init.d/apt-cacher-ng start ; tail -f /var/log/apt-cacher-ng/*\n",
3232
"full_description": "Docker Hub based automated build from a GitHub repo",
3333
"is_official": false,
3434
"is_private": true,

engine/admin/ambassador_pattern_linking.md

-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ case `192.168.1.52:6379`.
144144
# use alpine because its a minimal image with a package manager.
145145
# prettymuch all that is needed is a container that has a functioning env and socat (or equivalent)
146146
FROM alpine:3.2
147-
MAINTAINER [email protected]
148147

149148
RUN apk update && \
150149
apk add socat && \

engine/admin/using_supervisord.md

-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ Let's start by creating a basic `Dockerfile` for our new image.
2828

2929
```Dockerfile
3030
FROM ubuntu:16.04
31-
3231
```
3332

3433
## Installing Supervisor
@@ -98,7 +97,6 @@ Your completed Dockerfile now looks like this:
9897

9998
```Dockerfile
10099
FROM ubuntu:16.04
101-
102100

103101
RUN apt-get update && apt-get install -y openssh-server apache2 supervisor
104102
RUN mkdir -p /var/lock/apache2 /var/run/apache2 /var/run/sshd /var/log/supervisor

engine/examples/apt-cacher-ng.Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
# docker run -t -i --rm -e http_proxy http://dockerhost:3142/ debian bash
77
#
88
FROM ubuntu
9-
109

1110
VOLUME ["/var/cache/apt-cacher-ng"]
1211
RUN apt-get update && apt-get install -y apt-cacher-ng

engine/examples/apt-cacher-ng.md

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ Use the following Dockerfile:
2727
# Here, `dockerhost` is the IP address or FQDN of a host running the Docker daemon
2828
# which acts as an APT proxy server.
2929
FROM ubuntu
30-
MAINTAINER [email protected]
3130

3231
VOLUME ["/var/cache/apt-cacher-ng"]
3332
RUN apt-get update && apt-get install -y apt-cacher-ng

engine/examples/mongodb.md

-7
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,6 @@ We will build our image using the latest version of Ubuntu from the
5252
FROM ubuntu:latest
5353
```
5454

55-
Continuing, we will declare the `MAINTAINER` of the `Dockerfile`:
56-
57-
```dockerfile
58-
# Format: MAINTAINER Name <[email protected]>
59-
MAINTAINER M.Y. Name <[email protected]>
60-
```
61-
6255
> **Note:** Although Ubuntu systems have MongoDB packages, they are likely to
6356
> be outdated. Therefore in this example, we will use the official MongoDB
6457
> packages.

engine/examples/mongodb/Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
# http://docs.mongodb.org/manual/tutorial/install-mongodb-on-ubuntu/
44

55
FROM ubuntu:16.04
6-
MAINTAINER Docker
76

87
# Installation:
98
# Import MongoDB public GPG key AND create a MongoDB list file

engine/examples/postgresql_service.Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#
44

55
FROM ubuntu
6-
76

87
# Add the PostgreSQL PGP key to verify their Debian packages.
98
# It should be the same key as https://www.postgresql.org/media/keys/ACCC4CF8.asc

engine/examples/postgresql_service.md

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ suitably secure.
2626
#
2727

2828
FROM ubuntu
29-
3029

3130
# Add the PostgreSQL PGP key to verify their Debian packages.
3231
# It should be the same key as https://www.postgresql.org/media/keys/ACCC4CF8.asc

engine/examples/running_riak_service.Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
# Use the Ubuntu base image provided by dotCloud
66
FROM ubuntu:trusty
7-
MAINTAINER Hector Castro [email protected]
87

98
# Install Riak repository before we do apt-get update, so that update happens
109
# in a single step

engine/examples/running_riak_service.md

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ of. We'll use [Ubuntu](https://hub.docker.com/_/ubuntu/) (tag:
2323

2424
# Use the Ubuntu base image provided by dotCloud
2525
FROM ubuntu:trusty
26-
MAINTAINER Hector Castro [email protected]
2726

2827
After that, we install the curl which is used to download the repository setup
2928
script and we download the setup script and run it.

engine/examples/running_ssh_service.Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
FROM ubuntu:16.04
2-
MAINTAINER Sven Dowideit <[email protected]>
32

43
RUN apt-get update && apt-get install -y openssh-server
54
RUN mkdir /var/run/sshd

engine/examples/running_ssh_service.md

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ quick access to a test container.
1212

1313
```Dockerfile
1414
FROM ubuntu:16.04
15-
MAINTAINER Sven Dowideit <[email protected]>
1615

1716
RUN apt-get update && apt-get install -y openssh-server
1817
RUN mkdir /var/run/sshd

engine/reference/commandline/image_pull.md

+1
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ https://www.github.com/docker/docker
1313
-->
1414

1515
{% include cli.md %}
16+

engine/understanding-docker.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ instruction creates a new layer in the image. Some examples of Dockerfile
183183
instructions are:
184184

185185
* Specify the base image (`FROM`)
186-
* Specify the maintainer (`MAINTAINER`)
186+
* Specify image metadata (`LABEL`)
187187
* Run a command (`RUN`)
188188
* Add a file or directory (`ADD`)
189189
* Create an environment variable (`ENV`)

swarm/scheduler/filter.md

+2-7
Original file line numberDiff line numberDiff line change
@@ -138,22 +138,17 @@ Again, you'll avoid flash drives.
138138
$ mkdir sinatra
139139
$ cd sinatra
140140
$ echo "FROM ubuntu:14.04" > Dockerfile
141-
$ echo "MAINTAINER Kate Smith <[email protected]>" >> Dockerfile
142141
$ echo "RUN apt-get update && apt-get install -y ruby ruby-dev" >> Dockerfile
143142
$ echo "RUN gem install sinatra" >> Dockerfile
144143
$ docker build --build-arg=constraint:storage==disk -t ouruser/sinatra:v2 .
145144
Sending build context to Docker daemon 2.048 kB
146145
Step 1 : FROM ubuntu:14.04
147146
---> a5a467fddcb8
148-
Step 2 : MAINTAINER Kate Smith <[email protected]>
149-
---> Running in 49e97019dcb8
150-
---> de8670dcf80e
151-
Removing intermediate container 49e97019dcb8
152-
Step 3 : RUN apt-get update && apt-get install -y ruby ruby-dev
147+
Step 2 : RUN apt-get update && apt-get install -y ruby ruby-dev
153148
---> Running in 26c9fbc55aeb
154149
---> 30681ef95fff
155150
Removing intermediate container 26c9fbc55aeb
156-
Step 4 : RUN gem install sinatra
151+
Step 3 : RUN gem install sinatra
157152
---> Running in 68671d4a17b0
158153
---> cd70495a1514
159154
Removing intermediate container 68671d4a17b0

test.md

-1
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,6 @@ command=/bin/bash -c "source /etc/apache2/envvars && exec /usr/sbin/apache2 -DFO
297297
#
298298

299299
FROM ubuntu
300-
301300

302301
# Add the PostgreSQL PGP key to verify their Debian packages.
303302
# It should be the same key as https://www.postgresql.org/media/keys/ACCC4CF8.asc

tests/Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
FROM golang:1.7.3-alpine
2-
MAINTAINER Adrien Duermael <[email protected]>
32

43
COPY src /go/src
54
WORKDIR /go/src/validator

0 commit comments

Comments
 (0)