diff --git a/build/kube-dns/Dockerfile b/build/kube-dns/Dockerfile index 0ce83504c5..33f4382179 100644 --- a/build/kube-dns/Dockerfile +++ b/build/kube-dns/Dockerfile @@ -13,6 +13,5 @@ # limitations under the License. FROM BASEIMAGE -MAINTAINER Tim Hockin ADD kube-dns / ENTRYPOINT ["/kube-dns"] diff --git a/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile b/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile index c9dc57ef3f..1e26aa6dfd 100644 --- a/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile +++ b/cluster/addons/fluentd-elasticsearch/es-image/Dockerfile @@ -18,7 +18,6 @@ FROM java:openjdk-8-jre -MAINTAINER Mik Vyatskov "vmik@google.com" ENV DEBIAN_FRONTEND noninteractive ENV ELASTICSEARCH_VERSION 2.4.1 diff --git a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile index 7773109784..771ac2f4cf 100644 --- a/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile +++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile @@ -23,8 +23,6 @@ # information about installing fluentd using deb package. FROM gcr.io/google_containers/ubuntu-slim:0.4 -MAINTAINER Alex Robinson "arob@google.com" -MAINTAINER Jimmi Dyson "jimmidyson@gmail.com" # Ensure there are enough file descriptors for running Fluentd. RUN ulimit -n 65536 diff --git a/cluster/addons/fluentd-elasticsearch/kibana-image/Dockerfile b/cluster/addons/fluentd-elasticsearch/kibana-image/Dockerfile index cc921c0d7c..f098d96012 100644 --- a/cluster/addons/fluentd-elasticsearch/kibana-image/Dockerfile +++ b/cluster/addons/fluentd-elasticsearch/kibana-image/Dockerfile @@ -17,7 +17,6 @@ FROM gcr.io/google_containers/ubuntu-slim:0.4 -MAINTAINER Mik Vyatskov "vmik@google.com" ENV DEBIAN_FRONTEND noninteractive ENV KIBANA_VERSION 4.6.1 diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile index 164cc1de5b..3970e1771c 100644 --- a/cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile +++ b/cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile @@ -22,7 +22,6 @@ FROM gcr.io/google_containers/ubuntu-slim:0.4 -MAINTAINER Mik Vyatskov "vmik@google.com" # Disable prompts from apt ENV DEBIAN_FRONTEND noninteractive diff --git a/cluster/addons/registry/images/Dockerfile b/cluster/addons/registry/images/Dockerfile index 7b0d732333..51464fe72a 100644 --- a/cluster/addons/registry/images/Dockerfile +++ b/cluster/addons/registry/images/Dockerfile @@ -13,7 +13,6 @@ # limitations under the License. FROM nginx:1.11 -MAINTAINER Matthew Fisher RUN apt-get update \ && apt-get install -y \ diff --git a/cluster/gce/gci/mounter/Dockerfile b/cluster/gce/gci/mounter/Dockerfile index bfdc3f6b7d..f3d4f2c8c7 100644 --- a/cluster/gce/gci/mounter/Dockerfile +++ b/cluster/gce/gci/mounter/Dockerfile @@ -13,7 +13,6 @@ # limitations under the License. FROM ubuntu:xenial -MAINTAINER vishh@google.com RUN apt-get update && apt-get install -y netbase nfs-common=1:1.2.8-9ubuntu12 glusterfs-client=3.7.6-1ubuntu1 diff --git a/cluster/images/etcd-empty-dir-cleanup/Dockerfile b/cluster/images/etcd-empty-dir-cleanup/Dockerfile index 3daa63a9a6..3798a559ee 100644 --- a/cluster/images/etcd-empty-dir-cleanup/Dockerfile +++ b/cluster/images/etcd-empty-dir-cleanup/Dockerfile @@ -13,7 +13,6 @@ # limitations under the License. FROM gliderlabs/alpine -MAINTAINER Mehdy Bohlool RUN apk-install bash ADD etcd-empty-dir-cleanup.sh etcd-empty-dir-cleanup.sh diff --git a/cluster/images/etcd/Dockerfile b/cluster/images/etcd/Dockerfile index 8e14e77636..1d75d1787f 100644 --- a/cluster/images/etcd/Dockerfile +++ b/cluster/images/etcd/Dockerfile @@ -13,7 +13,6 @@ # limitations under the License. FROM BASEIMAGE -MAINTAINER Wojciech Tyczynski EXPOSE 2379 2380 4001 7001 COPY etcd* etcdctl* /usr/local/bin/ diff --git a/cmd/kubernetes-discovery/artifacts/simple-image/Dockerfile b/cmd/kubernetes-discovery/artifacts/simple-image/Dockerfile index 1cfe288c0f..fb1ce03a07 100644 --- a/cmd/kubernetes-discovery/artifacts/simple-image/Dockerfile +++ b/cmd/kubernetes-discovery/artifacts/simple-image/Dockerfile @@ -13,6 +13,5 @@ # limitations under the License. FROM fedora -MAINTAINER David Eads ADD kubernetes-discovery / ENTRYPOINT ["/kubernetes-discovery"] diff --git a/examples/explorer/Dockerfile b/examples/explorer/Dockerfile index ba76a04631..71c686c567 100644 --- a/examples/explorer/Dockerfile +++ b/examples/explorer/Dockerfile @@ -13,7 +13,6 @@ # limitations under the License. FROM scratch -MAINTAINER Daniel Smith ADD explorer explorer ADD README.md README.md EXPOSE 8080 diff --git a/examples/https-nginx/Dockerfile b/examples/https-nginx/Dockerfile index c144a7957f..f584088618 100644 --- a/examples/https-nginx/Dockerfile +++ b/examples/https-nginx/Dockerfile @@ -14,7 +14,6 @@ FROM nginx -MAINTAINER Mengqi Yu COPY index2.html /usr/share/nginx/html/index2.html RUN chmod +r /usr/share/nginx/html/index2.html diff --git a/examples/kubectl-container/Dockerfile b/examples/kubectl-container/Dockerfile index 53876edd9c..add0569c0b 100644 --- a/examples/kubectl-container/Dockerfile +++ b/examples/kubectl-container/Dockerfile @@ -13,6 +13,5 @@ # limitations under the License. FROM scratch -MAINTAINER Daniel Smith ADD kubectl kubectl ENTRYPOINT ["/kubectl"] diff --git a/examples/meteor/dockerbase/Dockerfile b/examples/meteor/dockerbase/Dockerfile index 1e573e141a..708e2cb437 100644 --- a/examples/meteor/dockerbase/Dockerfile +++ b/examples/meteor/dockerbase/Dockerfile @@ -13,7 +13,6 @@ # limitations under the License. FROM node:0.10 -MAINTAINER Christiaan Hees ONBUILD WORKDIR /appsrc ONBUILD COPY . /appsrc diff --git a/examples/storage/hazelcast/image/Dockerfile b/examples/storage/hazelcast/image/Dockerfile index d930c2f3df..05798ee734 100644 --- a/examples/storage/hazelcast/image/Dockerfile +++ b/examples/storage/hazelcast/image/Dockerfile @@ -14,7 +14,6 @@ FROM quay.io/pires/docker-jre:8u45-2 -MAINTAINER Paulo Pires EXPOSE 5701 diff --git a/examples/storage/rethinkdb/image/Dockerfile b/examples/storage/rethinkdb/image/Dockerfile index 9815f5f223..ff650cd249 100644 --- a/examples/storage/rethinkdb/image/Dockerfile +++ b/examples/storage/rethinkdb/image/Dockerfile @@ -14,7 +14,6 @@ FROM rethinkdb:1.16.0 -MAINTAINER BinZhao RUN apt-get update && \ apt-get install -yq curl && \ diff --git a/examples/volumes/nfs/nfs-data/Dockerfile b/examples/volumes/nfs/nfs-data/Dockerfile index c1450dcb59..96986bd801 100644 --- a/examples/volumes/nfs/nfs-data/Dockerfile +++ b/examples/volumes/nfs/nfs-data/Dockerfile @@ -13,7 +13,6 @@ # limitations under the License. FROM centos -MAINTAINER Jan Safranek, jsafrane@redhat.com; Huamin Chen, hchen@redhat.com RUN yum -y install /usr/bin/ps nfs-utils && yum clean all RUN mkdir -p /exports ADD run_nfs.sh /usr/local/bin/ diff --git a/test/images/clusterapi-tester/Dockerfile b/test/images/clusterapi-tester/Dockerfile index 298258a351..9327d22754 100644 --- a/test/images/clusterapi-tester/Dockerfile +++ b/test/images/clusterapi-tester/Dockerfile @@ -13,6 +13,5 @@ # limitations under the License. FROM busybox -MAINTAINER Prashanth B ADD main main ENTRYPOINT ["/main"] diff --git a/test/images/dnsutils/Dockerfile b/test/images/dnsutils/Dockerfile index 778cd4402c..0689ef0a76 100644 --- a/test/images/dnsutils/Dockerfile +++ b/test/images/dnsutils/Dockerfile @@ -13,7 +13,6 @@ # limitations under the License. FROM alpine -MAINTAINER Bowei Du "bowei@google.com" RUN apk update --no-cache RUN apk add bind-tools diff --git a/test/images/iperf/Dockerfile b/test/images/iperf/Dockerfile index 6c5ccd9f55..9bd39dad2a 100644 --- a/test/images/iperf/Dockerfile +++ b/test/images/iperf/Dockerfile @@ -13,7 +13,6 @@ # limitations under the License. FROM gcr.io/google_containers/ubuntu-slim:0.2 -MAINTAINER jay@apache.org RUN apt-get update && apt-get install -y --no-install-recommends iperf bash \ && apt-get clean -y \ && rm -rf /var/lib/apt/lists/* \ diff --git a/test/images/jessie-dnsutils/Dockerfile b/test/images/jessie-dnsutils/Dockerfile index 97500dfdec..abd6859ff8 100644 --- a/test/images/jessie-dnsutils/Dockerfile +++ b/test/images/jessie-dnsutils/Dockerfile @@ -13,7 +13,6 @@ # limitations under the License. FROM debian:jessie -MAINTAINER Abhishek Shah "abshah@google.com" RUN apt-get -q update && \ apt-get install -y dnsutils && \ diff --git a/test/images/logs-generator/Dockerfile b/test/images/logs-generator/Dockerfile index 17990a9f65..05b5038fb2 100644 --- a/test/images/logs-generator/Dockerfile +++ b/test/images/logs-generator/Dockerfile @@ -14,7 +14,6 @@ FROM gcr.io/google_containers/ubuntu-slim:0.4 -MAINTAINER Mik Vyatskov COPY logs-generator / diff --git a/test/images/n-way-http/Dockerfile b/test/images/n-way-http/Dockerfile index 63c4066cf4..100a2bdb53 100644 --- a/test/images/n-way-http/Dockerfile +++ b/test/images/n-way-http/Dockerfile @@ -13,6 +13,5 @@ # limitations under the License. FROM busybox -MAINTAINER Prashanth B ADD server server ENTRYPOINT ["/server"] diff --git a/test/images/net/Dockerfile b/test/images/net/Dockerfile index e54f38343b..cea15f4c04 100644 --- a/test/images/net/Dockerfile +++ b/test/images/net/Dockerfile @@ -13,6 +13,5 @@ # limitations under the License. FROM alpine -MAINTAINER Bowei Du COPY net /net RUN apk update && apk add curl diff --git a/test/images/netexec/Dockerfile b/test/images/netexec/Dockerfile index 3bcda40708..4ffe4a0448 100644 --- a/test/images/netexec/Dockerfile +++ b/test/images/netexec/Dockerfile @@ -13,7 +13,6 @@ # limitations under the License. FROM busybox -MAINTAINER Abhishek Shah "abshah@google.com" ADD netexec netexec ADD netexec.go netexec.go diff --git a/test/images/network-tester/Dockerfile b/test/images/network-tester/Dockerfile index 30a2be1448..7ecb9472f1 100644 --- a/test/images/network-tester/Dockerfile +++ b/test/images/network-tester/Dockerfile @@ -13,7 +13,6 @@ # limitations under the License. FROM scratch -MAINTAINER Daniel Smith ADD webserver webserver EXPOSE 8080 ENTRYPOINT ["/webserver"] diff --git a/test/images/pets/redis/Dockerfile b/test/images/pets/redis/Dockerfile index fef4b588a2..b29227fb08 100644 --- a/test/images/pets/redis/Dockerfile +++ b/test/images/pets/redis/Dockerfile @@ -15,7 +15,6 @@ # TODO: get rid of bash dependency and switch to plain busybox. # The tar in busybox also doesn't seem to understand compression. FROM debian:jessie -MAINTAINER Prashanth.B # TODO: just use standard redis when there is one for 3.2.0. RUN apt-get update && apt-get install -y wget make gcc diff --git a/test/images/pets/zookeeper/Dockerfile b/test/images/pets/zookeeper/Dockerfile index 51a82eb835..780615933f 100644 --- a/test/images/pets/zookeeper/Dockerfile +++ b/test/images/pets/zookeeper/Dockerfile @@ -15,7 +15,6 @@ # TODO: get rid of bash dependency and switch to plain busybox. # The tar in busybox also doesn't seem to understand compression. FROM debian:jessie -MAINTAINER Prashanth.B RUN apt-get update && apt-get install -y wget netcat diff --git a/test/images/porter/Dockerfile b/test/images/porter/Dockerfile index 6cde33b577..4e5b615604 100644 --- a/test/images/porter/Dockerfile +++ b/test/images/porter/Dockerfile @@ -13,7 +13,6 @@ # limitations under the License. FROM scratch -MAINTAINER Daniel Smith ADD localhost.crt localhost.crt ADD localhost.key localhost.key ADD porter porter diff --git a/test/images/resource-consumer/Dockerfile b/test/images/resource-consumer/Dockerfile index 523f68a17f..16fb24372e 100644 --- a/test/images/resource-consumer/Dockerfile +++ b/test/images/resource-consumer/Dockerfile @@ -13,7 +13,6 @@ # limitations under the License. FROM jess/stress -MAINTAINER Ewa Socala ADD consumer /consumer ADD consume-cpu /consume-cpu EXPOSE 8080 diff --git a/test/images/resource-consumer/controller/Dockerfile b/test/images/resource-consumer/controller/Dockerfile index f8fe32eca9..9850b801ed 100644 --- a/test/images/resource-consumer/controller/Dockerfile +++ b/test/images/resource-consumer/controller/Dockerfile @@ -13,7 +13,6 @@ # limitations under the License. FROM busybox -MAINTAINER Jerzy Szczepkowski ADD controller /controller EXPOSE 8080 ENTRYPOINT ["/controller"] diff --git a/test/images/serve_hostname/Dockerfile b/test/images/serve_hostname/Dockerfile index c942c7f62c..5c053a8445 100644 --- a/test/images/serve_hostname/Dockerfile +++ b/test/images/serve_hostname/Dockerfile @@ -13,7 +13,6 @@ # limitations under the License. FROM BASEIMAGE -MAINTAINER Tim Hockin ADD serve_hostname /serve_hostname EXPOSE 9376 ENTRYPOINT ["/serve_hostname"] diff --git a/test/images/volumes-tester/ceph/Dockerfile b/test/images/volumes-tester/ceph/Dockerfile index 75cdab4c4d..9286a9f84b 100644 --- a/test/images/volumes-tester/ceph/Dockerfile +++ b/test/images/volumes-tester/ceph/Dockerfile @@ -13,7 +13,6 @@ # limitations under the License. FROM centos:6 -MAINTAINER Huamin Chen, hchen@redhat.com ADD install.sh /usr/local/bin/ RUN /usr/local/bin/install.sh diff --git a/test/images/volumes-tester/gluster/Dockerfile b/test/images/volumes-tester/gluster/Dockerfile index 0e2625e35e..522e490687 100644 --- a/test/images/volumes-tester/gluster/Dockerfile +++ b/test/images/volumes-tester/gluster/Dockerfile @@ -13,7 +13,6 @@ # limitations under the License. FROM centos -MAINTAINER Jan Safranek, jsafrane@redhat.com RUN yum -y install hostname centos-release-gluster && yum -y install glusterfs-server && yum clean all ADD glusterd.vol /etc/glusterfs/ ADD run_gluster.sh /usr/local/bin/ diff --git a/test/images/volumes-tester/iscsi/Dockerfile b/test/images/volumes-tester/iscsi/Dockerfile index d965ef7730..ff3ab35fb7 100644 --- a/test/images/volumes-tester/iscsi/Dockerfile +++ b/test/images/volumes-tester/iscsi/Dockerfile @@ -13,7 +13,6 @@ # limitations under the License. FROM fedora -MAINTAINER Jan Safranek, jsafrane@redhat.com RUN yum install -y iscsi-initiator-utils targetcli net-tools strace && yum clean all ADD run_iscsid.sh /usr/local/bin/ ADD initiatorname.iscsi /etc/iscsi/ diff --git a/test/images/volumes-tester/nfs/Dockerfile b/test/images/volumes-tester/nfs/Dockerfile index f6ac8d1d99..c7bceb12af 100644 --- a/test/images/volumes-tester/nfs/Dockerfile +++ b/test/images/volumes-tester/nfs/Dockerfile @@ -13,7 +13,6 @@ # limitations under the License. FROM centos -MAINTAINER Jan Safranek, jsafrane@redhat.com RUN yum -y install /usr/bin/ps nfs-utils && yum clean all RUN mkdir -p /exports ADD run_nfs.sh /usr/local/bin/ diff --git a/test/images/volumes-tester/rbd/Dockerfile b/test/images/volumes-tester/rbd/Dockerfile index 4fb70e53c8..e195f3f064 100644 --- a/test/images/volumes-tester/rbd/Dockerfile +++ b/test/images/volumes-tester/rbd/Dockerfile @@ -16,7 +16,6 @@ # Based on image by Ricardo Rocha, ricardo@catalyst.net.nz FROM fedora -MAINTAINER Jan Safranek jsafrane@redhat.com # Base Packages RUN yum install -y wget ceph ceph-fuse strace && yum clean all diff --git a/test/soak/cauldron/Dockerfile b/test/soak/cauldron/Dockerfile index 36502d9e88..fc1c286d17 100644 --- a/test/soak/cauldron/Dockerfile +++ b/test/soak/cauldron/Dockerfile @@ -13,7 +13,6 @@ # limitations under the License. FROM busybox -MAINTAINER Satnam Singh ADD cauldron cauldron ADD cauldron.go cauldron.go ENTRYPOINT ["/cauldron"]