diff --git a/docker-hub/webhooks.md b/docker-hub/webhooks.md index 2ca3e1c802..19d3b7aa79 100644 --- a/docker-hub/webhooks.md +++ b/docker-hub/webhooks.md @@ -28,7 +28,7 @@ example webhook below generates an HTTP POST that delivers a JSON payload: "comment_count": "0", "date_created": 1.417494799e+09, "description": "", - "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\u0009SvenDowideit@home.org.au\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", + "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", "full_description": "Docker Hub based automated build from a GitHub repo", "is_official": false, "is_private": true, diff --git a/engine/admin/ambassador_pattern_linking.md b/engine/admin/ambassador_pattern_linking.md index 72b55bdeb0..55b1366dc6 100644 --- a/engine/admin/ambassador_pattern_linking.md +++ b/engine/admin/ambassador_pattern_linking.md @@ -144,7 +144,6 @@ case `192.168.1.52:6379`. # use alpine because its a minimal image with a package manager. # prettymuch all that is needed is a container that has a functioning env and socat (or equivalent) FROM alpine:3.2 - MAINTAINER SvenDowideit@home.org.au RUN apk update && \ apk add socat && \ diff --git a/engine/admin/using_supervisord.md b/engine/admin/using_supervisord.md index 3102790d24..42bd956258 100644 --- a/engine/admin/using_supervisord.md +++ b/engine/admin/using_supervisord.md @@ -28,7 +28,6 @@ Let's start by creating a basic `Dockerfile` for our new image. ```Dockerfile FROM ubuntu:16.04 -MAINTAINER examples@docker.com ``` ## Installing Supervisor @@ -98,7 +97,6 @@ Your completed Dockerfile now looks like this: ```Dockerfile FROM ubuntu:16.04 -MAINTAINER examples@docker.com RUN apt-get update && apt-get install -y openssh-server apache2 supervisor RUN mkdir -p /var/lock/apache2 /var/run/apache2 /var/run/sshd /var/log/supervisor diff --git a/engine/examples/apt-cacher-ng.Dockerfile b/engine/examples/apt-cacher-ng.Dockerfile index d1f76572b9..af9d885d24 100644 --- a/engine/examples/apt-cacher-ng.Dockerfile +++ b/engine/examples/apt-cacher-ng.Dockerfile @@ -6,7 +6,6 @@ # docker run -t -i --rm -e http_proxy http://dockerhost:3142/ debian bash # FROM ubuntu -MAINTAINER SvenDowideit@docker.com VOLUME ["/var/cache/apt-cacher-ng"] RUN apt-get update && apt-get install -y apt-cacher-ng diff --git a/engine/examples/apt-cacher-ng.md b/engine/examples/apt-cacher-ng.md index d2ec75ffd4..ec186133b8 100644 --- a/engine/examples/apt-cacher-ng.md +++ b/engine/examples/apt-cacher-ng.md @@ -27,7 +27,6 @@ Use the following Dockerfile: # Here, `dockerhost` is the IP address or FQDN of a host running the Docker daemon # which acts as an APT proxy server. FROM ubuntu - MAINTAINER SvenDowideit@docker.com VOLUME ["/var/cache/apt-cacher-ng"] RUN apt-get update && apt-get install -y apt-cacher-ng diff --git a/engine/examples/mongodb.md b/engine/examples/mongodb.md index eb007e3788..d6ac426cf3 100644 --- a/engine/examples/mongodb.md +++ b/engine/examples/mongodb.md @@ -52,13 +52,6 @@ We will build our image using the latest version of Ubuntu from the FROM ubuntu:latest ``` -Continuing, we will declare the `MAINTAINER` of the `Dockerfile`: - -```dockerfile -# Format: MAINTAINER Name -MAINTAINER M.Y. Name -``` - > **Note:** Although Ubuntu systems have MongoDB packages, they are likely to > be outdated. Therefore in this example, we will use the official MongoDB > packages. diff --git a/engine/examples/mongodb/Dockerfile b/engine/examples/mongodb/Dockerfile index aea59c155f..eb020979f0 100644 --- a/engine/examples/mongodb/Dockerfile +++ b/engine/examples/mongodb/Dockerfile @@ -3,7 +3,6 @@ # http://docs.mongodb.org/manual/tutorial/install-mongodb-on-ubuntu/ FROM ubuntu:16.04 -MAINTAINER Docker # Installation: # Import MongoDB public GPG key AND create a MongoDB list file diff --git a/engine/examples/postgresql_service.Dockerfile b/engine/examples/postgresql_service.Dockerfile index d5767c9384..9ee667eb92 100644 --- a/engine/examples/postgresql_service.Dockerfile +++ b/engine/examples/postgresql_service.Dockerfile @@ -3,7 +3,6 @@ # FROM ubuntu -MAINTAINER SvenDowideit@docker.com # Add the PostgreSQL PGP key to verify their Debian packages. # It should be the same key as https://www.postgresql.org/media/keys/ACCC4CF8.asc diff --git a/engine/examples/postgresql_service.md b/engine/examples/postgresql_service.md index 68b51f71ee..e864ef22c0 100644 --- a/engine/examples/postgresql_service.md +++ b/engine/examples/postgresql_service.md @@ -26,7 +26,6 @@ suitably secure. # FROM ubuntu -MAINTAINER SvenDowideit@docker.com # Add the PostgreSQL PGP key to verify their Debian packages. # It should be the same key as https://www.postgresql.org/media/keys/ACCC4CF8.asc diff --git a/engine/examples/running_riak_service.Dockerfile b/engine/examples/running_riak_service.Dockerfile index 9b82cb023a..72738ade44 100644 --- a/engine/examples/running_riak_service.Dockerfile +++ b/engine/examples/running_riak_service.Dockerfile @@ -4,7 +4,6 @@ # Use the Ubuntu base image provided by dotCloud FROM ubuntu:trusty -MAINTAINER Hector Castro hector@basho.com # Install Riak repository before we do apt-get update, so that update happens # in a single step diff --git a/engine/examples/running_riak_service.md b/engine/examples/running_riak_service.md index 5a68a3ea8a..1fe601b934 100644 --- a/engine/examples/running_riak_service.md +++ b/engine/examples/running_riak_service.md @@ -23,7 +23,6 @@ of. We'll use [Ubuntu](https://hub.docker.com/_/ubuntu/) (tag: # Use the Ubuntu base image provided by dotCloud FROM ubuntu:trusty - MAINTAINER Hector Castro hector@basho.com After that, we install the curl which is used to download the repository setup script and we download the setup script and run it. diff --git a/engine/examples/running_ssh_service.Dockerfile b/engine/examples/running_ssh_service.Dockerfile index 68023dbb3a..886b38a36b 100644 --- a/engine/examples/running_ssh_service.Dockerfile +++ b/engine/examples/running_ssh_service.Dockerfile @@ -1,5 +1,4 @@ FROM ubuntu:16.04 -MAINTAINER Sven Dowideit RUN apt-get update && apt-get install -y openssh-server RUN mkdir /var/run/sshd diff --git a/engine/examples/running_ssh_service.md b/engine/examples/running_ssh_service.md index 9e60160cdb..4b6541a651 100644 --- a/engine/examples/running_ssh_service.md +++ b/engine/examples/running_ssh_service.md @@ -12,7 +12,6 @@ quick access to a test container. ```Dockerfile FROM ubuntu:16.04 -MAINTAINER Sven Dowideit RUN apt-get update && apt-get install -y openssh-server RUN mkdir /var/run/sshd diff --git a/engine/reference/commandline/image_pull.md b/engine/reference/commandline/image_pull.md index 3a2cad8f4b..4ecd9d5f01 100644 --- a/engine/reference/commandline/image_pull.md +++ b/engine/reference/commandline/image_pull.md @@ -13,3 +13,4 @@ https://www.github.com/docker/docker --> {% include cli.md %} + diff --git a/engine/understanding-docker.md b/engine/understanding-docker.md index 6d75d88e87..0ffbbfb309 100644 --- a/engine/understanding-docker.md +++ b/engine/understanding-docker.md @@ -183,7 +183,7 @@ instruction creates a new layer in the image. Some examples of Dockerfile instructions are: * Specify the base image (`FROM`) -* Specify the maintainer (`MAINTAINER`) +* Specify image metadata (`LABEL`) * Run a command (`RUN`) * Add a file or directory (`ADD`) * Create an environment variable (`ENV`) diff --git a/swarm/scheduler/filter.md b/swarm/scheduler/filter.md index 29646cafb5..a3028bb55b 100644 --- a/swarm/scheduler/filter.md +++ b/swarm/scheduler/filter.md @@ -138,22 +138,17 @@ Again, you'll avoid flash drives. $ mkdir sinatra $ cd sinatra $ echo "FROM ubuntu:14.04" > Dockerfile -$ echo "MAINTAINER Kate Smith " >> Dockerfile $ echo "RUN apt-get update && apt-get install -y ruby ruby-dev" >> Dockerfile $ echo "RUN gem install sinatra" >> Dockerfile $ docker build --build-arg=constraint:storage==disk -t ouruser/sinatra:v2 . Sending build context to Docker daemon 2.048 kB Step 1 : FROM ubuntu:14.04 ---> a5a467fddcb8 -Step 2 : MAINTAINER Kate Smith - ---> Running in 49e97019dcb8 - ---> de8670dcf80e -Removing intermediate container 49e97019dcb8 -Step 3 : RUN apt-get update && apt-get install -y ruby ruby-dev +Step 2 : RUN apt-get update && apt-get install -y ruby ruby-dev ---> Running in 26c9fbc55aeb ---> 30681ef95fff Removing intermediate container 26c9fbc55aeb -Step 4 : RUN gem install sinatra +Step 3 : RUN gem install sinatra ---> Running in 68671d4a17b0 ---> cd70495a1514 Removing intermediate container 68671d4a17b0 diff --git a/test.md b/test.md index 1c6a12e966..ae1d0a8cd4 100644 --- a/test.md +++ b/test.md @@ -297,7 +297,6 @@ command=/bin/bash -c "source /etc/apache2/envvars && exec /usr/sbin/apache2 -DFO # FROM ubuntu -MAINTAINER SvenDowideit@docker.com # Add the PostgreSQL PGP key to verify their Debian packages. # It should be the same key as https://www.postgresql.org/media/keys/ACCC4CF8.asc diff --git a/tests/Dockerfile b/tests/Dockerfile index 948eec7094..7e2b18ec0e 100644 --- a/tests/Dockerfile +++ b/tests/Dockerfile @@ -1,5 +1,4 @@ FROM golang:1.7.3-alpine -MAINTAINER Adrien Duermael COPY src /go/src WORKDIR /go/src/validator