github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #38927 from luxas/remove_maintainer 

Automatic merge from submit-queue

Remove all MAINTAINER statements in the codebase as they are deprecated

**What this PR does / why we need it**:
ref: https://github.com/docker/docker/pull/25466

**Release note**:

```release-note
Remove all MAINTAINER statements in Dockerfiles in the codebase as they are deprecated by docker
```
@ixdy @thockin (who else should be notified?)
pull/6/head
Kubernetes Submit Queue 2016-12-29 16:41:24 -08:00 committed by GitHub
parent d97f125ddf 3c5b5f5963
commit 274a9f0f70
38 changed files with 0 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/kube-dns/Dockerfile
View File

@ -13,6 +13,5 @@
# limitations under the License.
FROM BASEIMAGE
MAINTAINER Tim Hockin <thockin@google.com>
ADD kube-dns /
ENTRYPOINT ["/kube-dns"]

1
cluster/addons/fluentd-elasticsearch/es-image/Dockerfile
View File

@ -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

2
cluster/addons/fluentd-elasticsearch/fluentd-es-image/Dockerfile
View File

@ -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

1
cluster/addons/fluentd-elasticsearch/kibana-image/Dockerfile
View File

@ -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

1
cluster/addons/fluentd-gcp/fluentd-gcp-image/Dockerfile
View File

@ -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

1
cluster/addons/registry/images/Dockerfile
View File

@ -13,7 +13,6 @@
# limitations under the License.
FROM nginx:1.11
MAINTAINER Matthew Fisher <mfisher@deis.com>
RUN apt-get update \
&& apt-get install -y \

1
cluster/gce/gci/mounter/Dockerfile
View File

@ -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

1
cluster/images/etcd-empty-dir-cleanup/Dockerfile
View File

@ -13,7 +13,6 @@
# limitations under the License.
FROM gliderlabs/alpine
MAINTAINER Mehdy Bohlool <mehdy@google.com>
RUN apk-install bash
ADD etcd-empty-dir-cleanup.sh etcd-empty-dir-cleanup.sh

1
cluster/images/etcd/Dockerfile
View File

@ -13,7 +13,6 @@
# limitations under the License.
FROM BASEIMAGE
MAINTAINER Wojciech Tyczynski <wojtekt@google.com>
EXPOSE 2379 2380 4001 7001
COPY etcd* etcdctl* /usr/local/bin/

1
cmd/kubernetes-discovery/artifacts/simple-image/Dockerfile
View File

@ -13,6 +13,5 @@
# limitations under the License.
FROM fedora
MAINTAINER David Eads <deads@redhat.com>
ADD kubernetes-discovery /
ENTRYPOINT ["/kubernetes-discovery"]

1
examples/explorer/Dockerfile
View File

@ -13,7 +13,6 @@
# limitations under the License.
FROM scratch
MAINTAINER Daniel Smith <dbsmith@google.com>
ADD explorer explorer
ADD README.md README.md
EXPOSE 8080

1
examples/https-nginx/Dockerfile
View File

@ -14,7 +14,6 @@
FROM nginx
MAINTAINER Mengqi Yu <mengqiy@google.com>
COPY index2.html /usr/share/nginx/html/index2.html
RUN chmod +r /usr/share/nginx/html/index2.html

1
examples/kubectl-container/Dockerfile
View File

@ -13,6 +13,5 @@
# limitations under the License.
FROM scratch
MAINTAINER Daniel Smith <dbsmith@google.com>
ADD kubectl kubectl
ENTRYPOINT ["/kubectl"]

1
examples/meteor/dockerbase/Dockerfile
View File

@ -13,7 +13,6 @@
# limitations under the License.
FROM node:0.10
MAINTAINER Christiaan Hees <christiaan@q42.nl>
ONBUILD WORKDIR /appsrc
ONBUILD COPY . /appsrc

1
examples/storage/hazelcast/image/Dockerfile
View File

@ -14,7 +14,6 @@
FROM quay.io/pires/docker-jre:8u45-2
MAINTAINER Paulo Pires <pjpires@gmail.com>
EXPOSE 5701

1
examples/storage/rethinkdb/image/Dockerfile
View File

@ -14,7 +14,6 @@
FROM rethinkdb:1.16.0
MAINTAINER BinZhao <wo@zhaob.in>
RUN apt-get update && \
apt-get install -yq curl && \

1
examples/volumes/nfs/nfs-data/Dockerfile
View File

@ -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/

1
test/images/clusterapi-tester/Dockerfile
View File

@ -13,6 +13,5 @@
# limitations under the License.
FROM busybox
MAINTAINER Prashanth B <beeps@google.com>
ADD main main
ENTRYPOINT ["/main"]

1
test/images/dnsutils/Dockerfile
View File

@ -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

1
test/images/iperf/Dockerfile
View File

@ -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/* \

1
test/images/jessie-dnsutils/Dockerfile
View File

@ -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 && \

1
test/images/logs-generator/Dockerfile
View File

@ -14,7 +14,6 @@
FROM gcr.io/google_containers/ubuntu-slim:0.4
MAINTAINER Mik Vyatskov <vmik@google.com>
COPY logs-generator /

1
test/images/n-way-http/Dockerfile
View File

@ -13,6 +13,5 @@
# limitations under the License.
FROM busybox
MAINTAINER Prashanth B <beeps@google.com>
ADD server server
ENTRYPOINT ["/server"]

1
test/images/net/Dockerfile
View File

@ -13,6 +13,5 @@
# limitations under the License.
FROM alpine
MAINTAINER Bowei Du <bowei@google.com>
COPY net /net
RUN apk update && apk add curl

1
test/images/netexec/Dockerfile
View File

@ -13,7 +13,6 @@
# limitations under the License.
FROM busybox
MAINTAINER Abhishek Shah "abshah@google.com"
ADD netexec netexec
ADD netexec.go netexec.go

1
test/images/network-tester/Dockerfile
View File

@ -13,7 +13,6 @@
# limitations under the License.
FROM scratch
MAINTAINER Daniel Smith <dbsmith@google.com>
ADD webserver webserver
EXPOSE 8080
ENTRYPOINT ["/webserver"]

1
test/images/pets/redis/Dockerfile
View File

@ -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 <beeps@google.com>
# TODO: just use standard redis when there is one for 3.2.0.
RUN apt-get update && apt-get install -y wget make gcc

1
test/images/pets/zookeeper/Dockerfile
View File

@ -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 <beeps@google.com>
RUN apt-get update && apt-get install -y wget netcat

1
test/images/porter/Dockerfile
View File

@ -13,7 +13,6 @@
# limitations under the License.
FROM scratch
MAINTAINER Daniel Smith <dbsmith@google.com>
ADD localhost.crt localhost.crt
ADD localhost.key localhost.key
ADD porter porter

1
test/images/resource-consumer/Dockerfile
View File

@ -13,7 +13,6 @@
# limitations under the License.
FROM jess/stress
MAINTAINER Ewa Socala <socaa@google.com>
ADD consumer /consumer
ADD consume-cpu /consume-cpu
EXPOSE 8080

1
test/images/resource-consumer/controller/Dockerfile
View File

@ -13,7 +13,6 @@
# limitations under the License.
FROM busybox
MAINTAINER Jerzy Szczepkowski <jsz@google.com>
ADD controller /controller
EXPOSE 8080
ENTRYPOINT ["/controller"]

1
test/images/serve_hostname/Dockerfile
View File

@ -13,7 +13,6 @@
# limitations under the License.
FROM BASEIMAGE
MAINTAINER Tim Hockin <thockin@google.com>
ADD serve_hostname /serve_hostname
EXPOSE 9376
ENTRYPOINT ["/serve_hostname"]

1
test/images/volumes-tester/ceph/Dockerfile
View File

@ -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

1
test/images/volumes-tester/gluster/Dockerfile
View File

@ -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/

1
test/images/volumes-tester/iscsi/Dockerfile
View File

@ -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/

1
test/images/volumes-tester/nfs/Dockerfile
View File

@ -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/

1
test/images/volumes-tester/rbd/Dockerfile
View File

@ -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

1
test/soak/cauldron/Dockerfile
View File

@ -13,7 +13,6 @@
# limitations under the License.
FROM busybox
MAINTAINER Satnam Singh <satnam@google.com>
ADD cauldron cauldron
ADD cauldron.go cauldron.go
ENTRYPOINT ["/cauldron"]