diff --git a/Docker/Countly/Dockerfile b/Docker/Countly/Dockerfile index 27faca9..b20e47e 100644 --- a/Docker/Countly/Dockerfile +++ b/Docker/Countly/Dockerfile @@ -1,8 +1,7 @@ FROM countly/countly-server:16.06 -MAINTAINER Eugene Zilman +LABEL maintainer "Eugene Zilman " # Add custom Countly configs - these in turn come from k8s volume ADD ./runit/countly-api.sh /etc/service/countly-api/run ADD ./runit/countly-dashboard.sh /etc/service/countly-dashboard/run - diff --git a/Docker/Wrk/Dockerfile b/Docker/Wrk/Dockerfile index b29ce91..94f53f2 100644 --- a/Docker/Wrk/Dockerfile +++ b/Docker/Wrk/Dockerfile @@ -1,6 +1,6 @@ FROM williamyeh/wrk:4.0.2 -MAINTAINER Eugene Zilman +LABEL maintainer "Eugene Zilman " RUN apk add --update curl --no-cache diff --git a/Docker/azure-cli/Dockerfile b/Docker/azure-cli/Dockerfile index a639254..3b43d5d 100644 --- a/Docker/azure-cli/Dockerfile +++ b/Docker/azure-cli/Dockerfile @@ -1,5 +1,5 @@ FROM azuresdk/azure-cli-python -MAINTAINER "Hippie Hacker " +LABEL maintainer "Hippie Hacker " COPY entrypoint.sh / ENTRYPOINT ["/entrypoint.sh"] -CMD ["azure"] \ No newline at end of file +CMD ["azure"] diff --git a/Docker/boinc/Dockerfile b/Docker/boinc/Dockerfile index 78f6b66..6a4e7fd 100644 --- a/Docker/boinc/Dockerfile +++ b/Docker/boinc/Dockerfile @@ -1,15 +1,15 @@ FROM phusion/baseimage:0.9.19 -MAINTAINER Eugene Zilman +LABEL maintainer "Eugene Zilman " RUN apt update -y && \ apt install -y boinc-client && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* + apt-get clean && \ + rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* RUN mkdir -p /var/lib/boinc-client/projects/www.worldcommunitygrid.org && \ mkdir -p /var/lib/boinc-client/slots && \ - chown -R boinc:boinc /var/lib/boinc-client + chown -R boinc:boinc /var/lib/boinc-client ADD runner.sh /var/lib/boinc-client ADD attach.sh /var/lib/boinc-client diff --git a/Docker/distcc-daemon/Dockerfile b/Docker/distcc-daemon/Dockerfile index 224da49..33e3458 100644 --- a/Docker/distcc-daemon/Dockerfile +++ b/Docker/distcc-daemon/Dockerfile @@ -1,5 +1,5 @@ FROM zilman/kernel -MAINTAINER Eugene Zilman +LABEL maintainer "Eugene Zilman " RUN apt-get install -y distcc distcc-pump @@ -7,4 +7,3 @@ COPY config /etc/default/distcc COPY runner.sh /runner.sh ENTRYPOINT ["/runner.sh"] - diff --git a/Docker/distcc-master/Dockerfile b/Docker/distcc-master/Dockerfile index 224da49..33e3458 100644 --- a/Docker/distcc-master/Dockerfile +++ b/Docker/distcc-master/Dockerfile @@ -1,5 +1,5 @@ FROM zilman/kernel -MAINTAINER Eugene Zilman +LABEL maintainer "Eugene Zilman " RUN apt-get install -y distcc distcc-pump @@ -7,4 +7,3 @@ COPY config /etc/default/distcc COPY runner.sh /runner.sh ENTRYPOINT ["/runner.sh"] - diff --git a/Docker/distcc/Dockerfile b/Docker/distcc/Dockerfile index 8926408..336fde5 100644 --- a/Docker/distcc/Dockerfile +++ b/Docker/distcc/Dockerfile @@ -1,5 +1,5 @@ FROM debian:stable -MAINTAINER Eugene Zilman +LABEL maintainer "Eugene Zilman " RUN apt-get clean && apt update && apt install -y @@ -11,4 +11,3 @@ COPY config /etc/default/distcc COPY runner.sh /runner.sh ENTRYPOINT ["/runner.sh"] - diff --git a/Docker/echo/Dockerfile b/Docker/echo/Dockerfile index f102d35..a29cb7d 100644 --- a/Docker/echo/Dockerfile +++ b/Docker/echo/Dockerfile @@ -1,5 +1,5 @@ FROM zilman/falcon -MAINTAINER Eugene Zilman +LABEL maintainer "Eugene Zilman " COPY echo.py /app.py diff --git a/Docker/falcon/Dockerfile b/Docker/falcon/Dockerfile index 73b8aec..525f5b3 100644 --- a/Docker/falcon/Dockerfile +++ b/Docker/falcon/Dockerfile @@ -1,5 +1,5 @@ FROM zilman/gunicorn -MAINTAINER Eugene Zilman +LABEL maintainer "Eugene Zilman " RUN pip install meinheld falcon diff --git a/Docker/fluentd-kubectl/Dockerfile b/Docker/fluentd-kubectl/Dockerfile index 37046c4..89edbba 100644 --- a/Docker/fluentd-kubectl/Dockerfile +++ b/Docker/fluentd-kubectl/Dockerfile @@ -1,5 +1,5 @@ FROM fluent/fluentd:latest-onbuild -MAINTAINER Eugene Zilman +LABEL maintainer "Eugene Zilman " WORKDIR /home/fluent ENV PATH /home/fluent/.gem/ruby/2.3.0/bin:$PATH ENV KUBE_LATEST_VERSION="v1.4.4" @@ -20,4 +20,3 @@ RUN apk --no-cache add sudo build-base ruby-dev && \ USER fluent CMD exec fluentd -c /fluentd/etc/$FLUENTD_CONF -p /fluentd/plugins $FLUENTD_OPT - diff --git a/Docker/fluentd-reportstats/Dockerfile b/Docker/fluentd-reportstats/Dockerfile index 4df013e..7616881 100644 --- a/Docker/fluentd-reportstats/Dockerfile +++ b/Docker/fluentd-reportstats/Dockerfile @@ -1,5 +1,5 @@ FROM fluent/fluentd:latest-onbuild -MAINTAINER Eugene Zilman +LABEL maintainer "Eugene Zilman " WORKDIR /home/fluent ENV PATH /home/fluent/.gem/ruby/2.3.0/bin:$PATH diff --git a/Docker/grafana/Dockerfile b/Docker/grafana/Dockerfile index 7c91285..632edc9 100644 --- a/Docker/grafana/Dockerfile +++ b/Docker/grafana/Dockerfile @@ -1,4 +1,4 @@ -FROM grafana/grafana:3.1.1 +FROM grafana/grafana:4.5.2 RUN apt-get update && \ apt-get install -y curl diff --git a/Docker/gunicorn/Dockerfile b/Docker/gunicorn/Dockerfile index 9b1f696..399010c 100644 --- a/Docker/gunicorn/Dockerfile +++ b/Docker/gunicorn/Dockerfile @@ -1,10 +1,8 @@ FROM python:2.7 -MAINTAINER Eugene Zilman +LABEL maintainer "Eugene Zilman " -RUN pip install gunicorn +RUN pip install gunicorn COPY gunicorn_conf.py / -ENTRYPOINT ["/usr/local/bin/gunicorn", "--config", "/gunicorn_conf.py"] - - +ENTRYPOINT ["/usr/local/bin/gunicorn", "--config", "/gunicorn_conf.py"] diff --git a/provisioning/Dockerfile b/provisioning/Dockerfile index 511dd03..c0ea2f2 100644 --- a/provisioning/Dockerfile +++ b/provisioning/Dockerfile @@ -1,5 +1,5 @@ FROM golang:alpine -MAINTAINER "Denver Williams " +LABEL maintainer "Denver Williams " ENV KUBECTL_VERSION=v1.5.2 ENV HELM_VERSION=v2.4.1 ENV GCLOUD_VERSION=150.0.0 @@ -39,7 +39,7 @@ tar xvzf helm-${HELM_VERSION}-linux-amd64.tar.gz && \ mv linux-amd64/helm /usr/local/bin && \ rm -rf helm-*gz linux-amd64 -# Install Terraform +# Install Terraform RUN wget https://releases.hashicorp.com/terraform/$TERRAFORM_VERSION/terraform_"${TERRAFORM_VERSION}"_linux_$ARC.zip RUN unzip terraform*.zip -d /usr/bin