From bbde07d42f165e6c4302d5de0a9ea7681be31e19 Mon Sep 17 00:00:00 2001 From: cglewis Date: Tue, 31 Oct 2017 10:32:09 -0700 Subject: [PATCH] MAINTAINER is deprecated, now using LABEL --- docker/Dockerfile.cloud-agent | 2 +- extras/example/app/Dockerfile | 2 +- extras/example/client/Dockerfile | 2 +- extras/example/echo/Dockerfile | 2 +- extras/example/frontend-k8s/Dockerfile | 2 +- extras/example/frontend/Dockerfile | 2 +- extras/example/qotd/Dockerfile | 2 +- extras/example/searchapp/Dockerfile | 2 +- extras/example/shout/Dockerfile | 2 +- extras/example/trace_app/Dockerfile | 2 +- tools/socks/Dockerfile | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docker/Dockerfile.cloud-agent b/docker/Dockerfile.cloud-agent index 7bcf8533db..508c7a994a 100644 --- a/docker/Dockerfile.cloud-agent +++ b/docker/Dockerfile.cloud-agent @@ -1,5 +1,5 @@ FROM alpine:3.5 -MAINTAINER Weaveworks Inc +LABEL maintainer="Weaveworks Inc " LABEL works.weave.role=system WORKDIR /home/weave RUN apk add --update bash conntrack-tools iproute2 util-linux curl && \ diff --git a/extras/example/app/Dockerfile b/extras/example/app/Dockerfile index 1f3d096102..f368aaf487 100644 --- a/extras/example/app/Dockerfile +++ b/extras/example/app/Dockerfile @@ -1,5 +1,5 @@ FROM tatsushid/tinycore-python:2.7 -MAINTAINER Weaveworks Inc +LABEL maintainer="Weaveworks Inc " WORKDIR /home/weave ADD requirements.txt /home/weave/ RUN pip install -r /home/weave/requirements.txt diff --git a/extras/example/client/Dockerfile b/extras/example/client/Dockerfile index 67ea58f5a7..1a71e88eec 100644 --- a/extras/example/client/Dockerfile +++ b/extras/example/client/Dockerfile @@ -1,5 +1,5 @@ FROM tatsushid/tinycore-python:2.7 -MAINTAINER Weaveworks Inc +LABEL maintainer="Weaveworks Inc " WORKDIR /home/weave ADD requirements.txt /home/weave/ RUN pip install -r /home/weave/requirements.txt diff --git a/extras/example/echo/Dockerfile b/extras/example/echo/Dockerfile index c7d1bcb525..598991e664 100644 --- a/extras/example/echo/Dockerfile +++ b/extras/example/echo/Dockerfile @@ -1,5 +1,5 @@ FROM tatsushid/tinycore-python:2.7 -MAINTAINER Weaveworks Inc +LABEL maintainer="Weaveworks Inc " WORKDIR /home/weave ADD requirements.txt /home/weave/ RUN pip install -r /home/weave/requirements.txt diff --git a/extras/example/frontend-k8s/Dockerfile b/extras/example/frontend-k8s/Dockerfile index d325d76195..240588f4a3 100644 --- a/extras/example/frontend-k8s/Dockerfile +++ b/extras/example/frontend-k8s/Dockerfile @@ -1,5 +1,5 @@ FROM ubuntu -MAINTAINER Weaveworks Inc +LABEL maintainer="Weaveworks Inc " RUN apt-get update && \ apt-get install -y nginx && \ rm -rf /var/lib/apt/lists/* diff --git a/extras/example/frontend/Dockerfile b/extras/example/frontend/Dockerfile index d325d76195..240588f4a3 100644 --- a/extras/example/frontend/Dockerfile +++ b/extras/example/frontend/Dockerfile @@ -1,5 +1,5 @@ FROM ubuntu -MAINTAINER Weaveworks Inc +LABEL maintainer="Weaveworks Inc " RUN apt-get update && \ apt-get install -y nginx && \ rm -rf /var/lib/apt/lists/* diff --git a/extras/example/qotd/Dockerfile b/extras/example/qotd/Dockerfile index 7f71ba66c1..9774ffa874 100644 --- a/extras/example/qotd/Dockerfile +++ b/extras/example/qotd/Dockerfile @@ -1,5 +1,5 @@ FROM ubuntu -MAINTAINER Weaveworks Inc +LABEL maintainer="Weaveworks Inc " WORKDIR /home/weave ADD ./qotd /home/weave/ EXPOSE 4446 diff --git a/extras/example/searchapp/Dockerfile b/extras/example/searchapp/Dockerfile index 0d92199494..aed30d5fd1 100644 --- a/extras/example/searchapp/Dockerfile +++ b/extras/example/searchapp/Dockerfile @@ -1,5 +1,5 @@ FROM progrium/busybox -MAINTAINER Weaveworks Inc +LABEL maintainer="Weaveworks Inc " WORKDIR /home/weave ADD searchapp /home/weave/ EXPOSE 8080 diff --git a/extras/example/shout/Dockerfile b/extras/example/shout/Dockerfile index 57bda117f7..85930944fa 100644 --- a/extras/example/shout/Dockerfile +++ b/extras/example/shout/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:latest -MAINTAINER Weaveworks Inc +LABEL maintainer="Weaveworks Inc " WORKDIR /home/weave ADD shout /home/weave/ EXPOSE 8090 diff --git a/extras/example/trace_app/Dockerfile b/extras/example/trace_app/Dockerfile index 1f3d096102..f368aaf487 100644 --- a/extras/example/trace_app/Dockerfile +++ b/extras/example/trace_app/Dockerfile @@ -1,5 +1,5 @@ FROM tatsushid/tinycore-python:2.7 -MAINTAINER Weaveworks Inc +LABEL maintainer="Weaveworks Inc " WORKDIR /home/weave ADD requirements.txt /home/weave/ RUN pip install -r /home/weave/requirements.txt diff --git a/tools/socks/Dockerfile b/tools/socks/Dockerfile index 867cd6bc50..ffafeb03bc 100644 --- a/tools/socks/Dockerfile +++ b/tools/socks/Dockerfile @@ -1,5 +1,5 @@ FROM gliderlabs/alpine -MAINTAINER Weaveworks Inc +LABEL maintainer="Weaveworks Inc " WORKDIR / COPY proxy / EXPOSE 8000