Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MAINTAINER is deprecated, now using LABEL #2916

Merged
merged 1 commit into from
Nov 1, 2017
Merged

MAINTAINER is deprecated, now using LABEL #2916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/Dockerfile.cloud-agent
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM alpine:3.5
MAINTAINER Weaveworks Inc <[email protected]>
LABEL maintainer="Weaveworks Inc <[email protected]>"
LABEL works.weave.role=system
WORKDIR /home/weave
RUN apk add --update bash conntrack-tools iproute2 util-linux curl && \
Expand Down
2 changes: 1 addition & 1 deletion extras/example/app/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM tatsushid/tinycore-python:2.7
MAINTAINER Weaveworks Inc <[email protected]>
LABEL maintainer="Weaveworks Inc <[email protected]>"
WORKDIR /home/weave
ADD requirements.txt /home/weave/
RUN pip install -r /home/weave/requirements.txt
Expand Down
2 changes: 1 addition & 1 deletion extras/example/client/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM tatsushid/tinycore-python:2.7
MAINTAINER Weaveworks Inc <[email protected]>
LABEL maintainer="Weaveworks Inc <[email protected]>"
WORKDIR /home/weave
ADD requirements.txt /home/weave/
RUN pip install -r /home/weave/requirements.txt
Expand Down
2 changes: 1 addition & 1 deletion extras/example/echo/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM tatsushid/tinycore-python:2.7
MAINTAINER Weaveworks Inc <[email protected]>
LABEL maintainer="Weaveworks Inc <[email protected]>"
WORKDIR /home/weave
ADD requirements.txt /home/weave/
RUN pip install -r /home/weave/requirements.txt
Expand Down
2 changes: 1 addition & 1 deletion extras/example/frontend-k8s/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM ubuntu
MAINTAINER Weaveworks Inc <[email protected]>
LABEL maintainer="Weaveworks Inc <[email protected]>"
RUN apt-get update && \
apt-get install -y nginx && \
rm -rf /var/lib/apt/lists/*
Expand Down
2 changes: 1 addition & 1 deletion extras/example/frontend/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM ubuntu
MAINTAINER Weaveworks Inc <[email protected]>
LABEL maintainer="Weaveworks Inc <[email protected]>"
RUN apt-get update && \
apt-get install -y nginx && \
rm -rf /var/lib/apt/lists/*
Expand Down
2 changes: 1 addition & 1 deletion extras/example/qotd/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM ubuntu
MAINTAINER Weaveworks Inc <[email protected]>
LABEL maintainer="Weaveworks Inc <[email protected]>"
WORKDIR /home/weave
ADD ./qotd /home/weave/
EXPOSE 4446
Expand Down
2 changes: 1 addition & 1 deletion extras/example/searchapp/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM progrium/busybox
MAINTAINER Weaveworks Inc <[email protected]>
LABEL maintainer="Weaveworks Inc <[email protected]>"
WORKDIR /home/weave
ADD searchapp /home/weave/
EXPOSE 8080
Expand Down
2 changes: 1 addition & 1 deletion extras/example/shout/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM alpine:latest
MAINTAINER Weaveworks Inc <[email protected]>
LABEL maintainer="Weaveworks Inc <[email protected]>"
WORKDIR /home/weave
ADD shout /home/weave/
EXPOSE 8090
Expand Down
2 changes: 1 addition & 1 deletion extras/example/trace_app/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM tatsushid/tinycore-python:2.7
MAINTAINER Weaveworks Inc <[email protected]>
LABEL maintainer="Weaveworks Inc <[email protected]>"
WORKDIR /home/weave
ADD requirements.txt /home/weave/
RUN pip install -r /home/weave/requirements.txt
Expand Down
2 changes: 1 addition & 1 deletion tools/socks/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM gliderlabs/alpine
MAINTAINER Weaveworks Inc <[email protected]>
LABEL maintainer="Weaveworks Inc <[email protected]>"
WORKDIR /
COPY proxy /
EXPOSE 8000
Expand Down