From 70e10a49535daf1eec128ab13601d7faaeb4ddc2 Mon Sep 17 00:00:00 2001 From: Shao Yu Lung Date: Fri, 16 Mar 2018 17:34:47 +0800 Subject: [PATCH] MAINTAINER is deprecated --- adminer/Dockerfile | 2 +- aerospike/Dockerfile | 4 ++-- apache2/Dockerfile | 2 +- aws/Dockerfile | 2 +- beanstalkd-console/Dockerfile | 2 +- beanstalkd/Dockerfile | 4 ++-- caddy/Dockerfile | 3 +-- certbot/Dockerfile | 2 +- haproxy/Dockerfile | 2 +- hhvm/Dockerfile | 2 +- maildev/Dockerfile | 2 +- mailhog/Dockerfile | 2 +- mariadb/Dockerfile | 2 +- mssql/Dockerfile | 2 +- php-fpm/Dockerfile-56 | 2 +- php-fpm/Dockerfile-70 | 2 +- php-fpm/Dockerfile-71 | 2 +- php-fpm/Dockerfile-72 | 2 +- workspace/Dockerfile-56 | 2 +- workspace/Dockerfile-70 | 2 +- workspace/Dockerfile-71 | 2 +- workspace/Dockerfile-72 | 2 +- 22 files changed, 24 insertions(+), 25 deletions(-) diff --git a/adminer/Dockerfile b/adminer/Dockerfile index 818c8e13..fb66a3e4 100644 --- a/adminer/Dockerfile +++ b/adminer/Dockerfile @@ -3,7 +3,7 @@ FROM adminer:4.3.0 # Version 4.3.1 contains PostgreSQL login errors. See docs. # See https://sourceforge.net/p/adminer/bugs-and-features/548/ -MAINTAINER Patrick Artounian +LABEL maintainer="Patrick Artounian " # Add volume for sessions to allow session persistence VOLUME /sessions diff --git a/aerospike/Dockerfile b/aerospike/Dockerfile index 665a279c..e4a6e273 100644 --- a/aerospike/Dockerfile +++ b/aerospike/Dockerfile @@ -1,7 +1,7 @@ FROM aerospike:latest -MAINTAINER Luciano Jr +LABEL maintainer="Luciano Jr " RUN rm /etc/aerospike/aerospike.conf -ADD aerospike.conf /etc/aerospike/aerospike.conf \ No newline at end of file +ADD aerospike.conf /etc/aerospike/aerospike.conf diff --git a/apache2/Dockerfile b/apache2/Dockerfile index 9624d975..d15d0082 100644 --- a/apache2/Dockerfile +++ b/apache2/Dockerfile @@ -1,6 +1,6 @@ FROM webdevops/apache:ubuntu-16.04 -MAINTAINER Eric Pfeiffer +LABEL maintainer="Eric Pfeiffer " ARG PHP_UPSTREAM_CONTAINER=php-fpm ARG PHP_UPSTREAM_PORT=9000 diff --git a/aws/Dockerfile b/aws/Dockerfile index 4f03e9dc..44dd1362 100644 --- a/aws/Dockerfile +++ b/aws/Dockerfile @@ -1,6 +1,6 @@ FROM python:slim -MAINTAINER melchabcede@gmail.com +LABEL maintainer="melchabcede@gmail.com" RUN pip install --upgrade --no-cache-dir awsebcli RUN apt-get -yqq update && apt-get -yqq install git-all diff --git a/beanstalkd-console/Dockerfile b/beanstalkd-console/Dockerfile index b07f1e36..1a768bd0 100644 --- a/beanstalkd-console/Dockerfile +++ b/beanstalkd-console/Dockerfile @@ -1,6 +1,6 @@ FROM php:latest -MAINTAINER Mahmoud Zalt +LABEL maintainer="Mahmoud Zalt " RUN apt-get update && apt-get install -y curl diff --git a/beanstalkd/Dockerfile b/beanstalkd/Dockerfile index ea1f87a8..b95a3519 100644 --- a/beanstalkd/Dockerfile +++ b/beanstalkd/Dockerfile @@ -1,6 +1,6 @@ FROM phusion/baseimage:latest -MAINTAINER Mahmoud Zalt +LABEL maintainer="Mahmoud Zalt " ENV DEBIAN_FRONTEND noninteractive ENV PATH /usr/local/rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin @@ -13,4 +13,4 @@ VOLUME /var/lib/beanstalkd/data EXPOSE 11300 -CMD ["/usr/bin/beanstalkd"] \ No newline at end of file +CMD ["/usr/bin/beanstalkd"] diff --git a/caddy/Dockerfile b/caddy/Dockerfile index 70d69c38..92b5baba 100644 --- a/caddy/Dockerfile +++ b/caddy/Dockerfile @@ -1,7 +1,6 @@ FROM zuohuadong/caddy:alpine - -MAINTAINER Huadong Zuo +LABEL maintainer="Huadong Zuo " ARG plugins="cors" diff --git a/certbot/Dockerfile b/certbot/Dockerfile index 3ce7546f..ad951132 100644 --- a/certbot/Dockerfile +++ b/certbot/Dockerfile @@ -1,6 +1,6 @@ FROM phusion/baseimage:latest -MAINTAINER Mahmoud Zalt +LABEL maintainer="Mahmoud Zalt " COPY run-certbot.sh /root/certbot/run-certbot.sh diff --git a/haproxy/Dockerfile b/haproxy/Dockerfile index ceca7191..c614892d 100644 --- a/haproxy/Dockerfile +++ b/haproxy/Dockerfile @@ -1,5 +1,5 @@ FROM dockercloud/haproxy:latest -MAINTAINER ZeroC0D3 Team +LABEL maintainer="ZeroC0D3 Team" EXPOSE 80 diff --git a/hhvm/Dockerfile b/hhvm/Dockerfile index 92b8905f..1b10cded 100644 --- a/hhvm/Dockerfile +++ b/hhvm/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:14.04 -MAINTAINER Mahmoud Zalt +LABEL maintainer="Mahmoud Zalt " RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0x5a16e7281be7a449 diff --git a/maildev/Dockerfile b/maildev/Dockerfile index 4484c832..c12e3ba3 100644 --- a/maildev/Dockerfile +++ b/maildev/Dockerfile @@ -1,5 +1,5 @@ FROM djfarrelly/maildev -MAINTAINER Maxime Hélias +LABEL maintainer="Maxime Hélias " EXPOSE 80 25 diff --git a/mailhog/Dockerfile b/mailhog/Dockerfile index 4b404d16..4565461b 100644 --- a/mailhog/Dockerfile +++ b/mailhog/Dockerfile @@ -1,6 +1,6 @@ FROM mailhog/mailhog -MAINTAINER Mahmoud Zalt +LABEL maintainer="Mahmoud Zalt " CMD ["Mailhog"] diff --git a/mariadb/Dockerfile b/mariadb/Dockerfile index fa25b26e..05b984f0 100644 --- a/mariadb/Dockerfile +++ b/mariadb/Dockerfile @@ -1,6 +1,6 @@ FROM mariadb:latest -MAINTAINER Mahmoud Zalt +LABEL maintainer="Mahmoud Zalt " ADD my.cnf /etc/mysql/conf.d/my.cnf diff --git a/mssql/Dockerfile b/mssql/Dockerfile index de67f6d7..2d9e5ac9 100644 --- a/mssql/Dockerfile +++ b/mssql/Dockerfile @@ -1,6 +1,6 @@ FROM microsoft/mssql-server-linux -MAINTAINER Mahmoud Zalt +LABEL maintainer="Mahmoud Zalt " # Create config directory # an set it as WORKDIR diff --git a/php-fpm/Dockerfile-56 b/php-fpm/Dockerfile-56 index 90817072..93bc0ba8 100644 --- a/php-fpm/Dockerfile-56 +++ b/php-fpm/Dockerfile-56 @@ -14,7 +14,7 @@ FROM laradock/php-fpm:2.0-56 -MAINTAINER Mahmoud Zalt +LABEL maintainer="Mahmoud Zalt " # #-------------------------------------------------------------------------- diff --git a/php-fpm/Dockerfile-70 b/php-fpm/Dockerfile-70 index b2cb1296..f0dfb44e 100644 --- a/php-fpm/Dockerfile-70 +++ b/php-fpm/Dockerfile-70 @@ -14,7 +14,7 @@ FROM laradock/php-fpm:2.0-70 -MAINTAINER Mahmoud Zalt +LABEL maintainer="Mahmoud Zalt " # #-------------------------------------------------------------------------- diff --git a/php-fpm/Dockerfile-71 b/php-fpm/Dockerfile-71 index 7ed0f75b..13c6001c 100644 --- a/php-fpm/Dockerfile-71 +++ b/php-fpm/Dockerfile-71 @@ -14,7 +14,7 @@ FROM laradock/php-fpm:2.0-71 -MAINTAINER Mahmoud Zalt +LABEL maintainer="Mahmoud Zalt " # #-------------------------------------------------------------------------- diff --git a/php-fpm/Dockerfile-72 b/php-fpm/Dockerfile-72 index ddde4092..0a372a2d 100644 --- a/php-fpm/Dockerfile-72 +++ b/php-fpm/Dockerfile-72 @@ -14,7 +14,7 @@ FROM laradock/php-fpm:2.0-72 -MAINTAINER Mahmoud Zalt +LABEL maintainer="Mahmoud Zalt " # #-------------------------------------------------------------------------- diff --git a/workspace/Dockerfile-56 b/workspace/Dockerfile-56 index a378ded6..52d2a001 100644 --- a/workspace/Dockerfile-56 +++ b/workspace/Dockerfile-56 @@ -14,7 +14,7 @@ FROM laradock/workspace:2.0-56 -MAINTAINER Mahmoud Zalt +LABEL maintainer="Mahmoud Zalt " # Remove Faillog and Lastlog to reduce the size of the final image. RUN rm /var/log/lastlog /var/log/faillog diff --git a/workspace/Dockerfile-70 b/workspace/Dockerfile-70 index 4afa0f9a..384dbbde 100644 --- a/workspace/Dockerfile-70 +++ b/workspace/Dockerfile-70 @@ -14,7 +14,7 @@ FROM laradock/workspace:2.0-70 -MAINTAINER Mahmoud Zalt +LABEL maintainer="Mahmoud Zalt " # Remove Faillog and Lastlog to reduce the size of the final image. RUN rm /var/log/lastlog /var/log/faillog diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71 index 1865d266..b5521c7f 100644 --- a/workspace/Dockerfile-71 +++ b/workspace/Dockerfile-71 @@ -14,7 +14,7 @@ FROM laradock/workspace:2.0-71 -MAINTAINER Mahmoud Zalt +LABEL maintainer="Mahmoud Zalt " # Remove Faillog and Lastlog to reduce the size of the final image. RUN rm /var/log/lastlog /var/log/faillog diff --git a/workspace/Dockerfile-72 b/workspace/Dockerfile-72 index abbaf5f8..3a042ee8 100644 --- a/workspace/Dockerfile-72 +++ b/workspace/Dockerfile-72 @@ -14,7 +14,7 @@ FROM laradock/workspace:2.0-72 -MAINTAINER Mahmoud Zalt +LABEL maintainer="Mahmoud Zalt " # Remove Faillog and Lastlog to reduce the size of the final image. RUN rm /var/log/lastlog /var/log/faillog