-
Notifications
You must be signed in to change notification settings - Fork 712
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3171 from weaveworks/add-opencontainers-labels-to…
…-dockerfiles Add org.opencontainers.image.* labels to Dockerfiles
- Loading branch information
Showing
16 changed files
with
103 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,15 @@ | ||
FROM alpine:3.5 | ||
LABEL maintainer="Weaveworks Inc <help@weave.works>" | ||
LABEL works.weave.role=system | ||
WORKDIR /home/weave | ||
RUN apk add --update bash conntrack-tools iproute2 util-linux curl && \ | ||
rm -rf /var/cache/apk/* | ||
ADD ./weave ./weaveutil /usr/bin/ | ||
COPY ./scope /home/weave/ | ||
ENTRYPOINT ["/home/weave/scope", "--mode=probe", "--no-app", "--probe.docker=true"] | ||
|
||
ARG revision | ||
LABEL works.weave.role="system" \ | ||
maintainer="Weaveworks <help@weave.works>" \ | ||
org.opencontainers.image.title="cloud-agent" \ | ||
org.opencontainers.image.source="https://github.com/weaveworks/scope" \ | ||
org.opencontainers.image.revision="${revision}" \ | ||
org.opencontainers.image.vendor="Weaveworks" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,9 @@ | ||
FROM golang:1.7 | ||
ADD ./bin/dialer /go/bin | ||
|
||
ARG revision | ||
LABEL maintainer="Weaveworks <help@weave.works>" \ | ||
org.opencontainers.image.title="dialer" \ | ||
org.opencontainers.image.source="https://github.com/weaveworks/scope/tree/master/extras/dialer" \ | ||
org.opencontainers.image.revision="${revision}" \ | ||
org.opencontainers.image.vendor="Weaveworks" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,14 @@ | ||
FROM tatsushid/tinycore-python:2.7 | ||
LABEL maintainer="Weaveworks Inc <help@weave.works>" | ||
WORKDIR /home/weave | ||
ADD requirements.txt /home/weave/ | ||
RUN pip install -r /home/weave/requirements.txt | ||
ADD app.py /home/weave/ | ||
EXPOSE 5000 | ||
ENTRYPOINT ["python", "/home/weave/app.py"] | ||
|
||
ARG revision | ||
LABEL maintainer="Weaveworks <help@weave.works>" \ | ||
org.opencontainers.image.title="example-app" \ | ||
org.opencontainers.image.source="https://github.com/weaveworks/scope/tree/master/extras/example/app" \ | ||
org.opencontainers.image.revision="${revision}" \ | ||
org.opencontainers.image.vendor="Weaveworks" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,13 @@ | ||
FROM tatsushid/tinycore-python:2.7 | ||
LABEL maintainer="Weaveworks Inc <help@weave.works>" | ||
WORKDIR /home/weave | ||
ADD requirements.txt /home/weave/ | ||
RUN pip install -r /home/weave/requirements.txt | ||
ADD client.py /home/weave/ | ||
ENTRYPOINT ["python", "/home/weave/client.py"] | ||
|
||
ARG revision | ||
LABEL maintainer="Weaveworks <help@weave.works>" \ | ||
org.opencontainers.image.title="example-client" \ | ||
org.opencontainers.image.source="https://github.com/weaveworks/scope/tree/master/extras/example/client" \ | ||
org.opencontainers.image.revision="${revision}" \ | ||
org.opencontainers.image.vendor="Weaveworks" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,14 @@ | ||
FROM tatsushid/tinycore-python:2.7 | ||
LABEL maintainer="Weaveworks Inc <help@weave.works>" | ||
WORKDIR /home/weave | ||
ADD requirements.txt /home/weave/ | ||
RUN pip install -r /home/weave/requirements.txt | ||
ADD echo.py /home/weave/ | ||
EXPOSE 5000 | ||
ENTRYPOINT ["python", "/home/weave/echo.py"] | ||
|
||
ARG revision | ||
LABEL maintainer="Weaveworks <help@weave.works>" \ | ||
org.opencontainers.image.title="example-echo" \ | ||
org.opencontainers.image.source="https://github.com/weaveworks/scope/tree/master/extras/example/echo" \ | ||
org.opencontainers.image.revision="${revision}" \ | ||
org.opencontainers.image.vendor="Weaveworks" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,12 @@ | ||
FROM ubuntu | ||
LABEL maintainer="Weaveworks Inc <help@weave.works>" | ||
WORKDIR /home/weave | ||
ADD ./qotd /home/weave/ | ||
EXPOSE 4446 | ||
ENTRYPOINT ["/home/weave/qotd"] | ||
|
||
ARG revision | ||
LABEL maintainer="Weaveworks <help@weave.works>" \ | ||
org.opencontainers.image.title="example-qotd" \ | ||
org.opencontainers.image.source="https://github.com/weaveworks/scope/tree/master/extras/example/qotd" \ | ||
org.opencontainers.image.revision="${revision}" \ | ||
org.opencontainers.image.vendor="Weaveworks" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,12 @@ | ||
FROM progrium/busybox | ||
LABEL maintainer="Weaveworks Inc <help@weave.works>" | ||
WORKDIR /home/weave | ||
ADD searchapp /home/weave/ | ||
EXPOSE 8080 | ||
ENTRYPOINT ["/home/weave/searchapp"] | ||
|
||
ARG revision | ||
LABEL maintainer="Weaveworks <help@weave.works>" \ | ||
org.opencontainers.image.title="example-searchapp" \ | ||
org.opencontainers.image.source="https://github.com/weaveworks/scope/tree/master/extras/example/searchapp" \ | ||
org.opencontainers.image.revision="${revision}" \ | ||
org.opencontainers.image.vendor="Weaveworks" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,12 @@ | ||
FROM alpine:latest | ||
LABEL maintainer="Weaveworks Inc <help@weave.works>" | ||
WORKDIR /home/weave | ||
ADD shout /home/weave/ | ||
EXPOSE 8090 | ||
ENTRYPOINT ["/home/weave/shout"] | ||
|
||
ARG revision | ||
LABEL maintainer="Weaveworks <help@weave.works>" \ | ||
org.opencontainers.image.title="example-shout" \ | ||
org.opencontainers.image.source="https://github.com/weaveworks/scope/tree/master/extras/example/shout" \ | ||
org.opencontainers.image.revision="${revision}" \ | ||
org.opencontainers.image.vendor="Weaveworks" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,14 @@ | ||
FROM tatsushid/tinycore-python:2.7 | ||
LABEL maintainer="Weaveworks Inc <help@weave.works>" | ||
WORKDIR /home/weave | ||
ADD requirements.txt /home/weave/ | ||
RUN pip install -r /home/weave/requirements.txt | ||
ADD app.py /home/weave/ | ||
EXPOSE 5000 | ||
ENTRYPOINT ["python", "/home/weave/app.py"] | ||
|
||
ARG revision | ||
LABEL maintainer="Weaveworks <help@weave.works>" \ | ||
org.opencontainers.image.title="example-trace_app" \ | ||
org.opencontainers.image.source="https://github.com/weaveworks/scope/tree/master/extras/example/trace_app" \ | ||
org.opencontainers.image.revision="${revision}" \ | ||
org.opencontainers.image.vendor="Weaveworks" |