This repository has been archived by the owner on Jun 20, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 668
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 #3299 from weaveworks/add-opencontainers-labels-to…
…-dockerfiles Add org.opencontainers.image.* labels to Dockerfiles
- Loading branch information
Showing
6 changed files
with
75 additions
and
19 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,14 @@ | ||
FROM DOCKERHUB_USER/weaveARCH_EXT | ||
|
||
# These labels are pretty static, and can therefore be added early on: | ||
LABEL maintainer="Weaveworks <help@weave.works>" \ | ||
org.opencontainers.image.title="weave-kube" \ | ||
org.opencontainers.image.source="https://github.com/weaveworks/weave" \ | ||
org.opencontainers.image.vendor="Weaveworks" | ||
|
||
ADD ./launch.sh ./kube-peers /home/weave/ | ||
ENTRYPOINT ["/home/weave/launch.sh"] | ||
|
||
# This label will change for every build, and should therefore be the last layer of the image: | ||
ARG revision | ||
LABEL org.opencontainers.image.revision="${revision}" |
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,7 +1,17 @@ | ||
# This is a nearly-empty image that we use to create a data-only container for persistence | ||
FROM scratch | ||
LABEL maintainer "Weaveworks Inc <help@weave.works>" | ||
LABEL works.weave.role=system | ||
|
||
# These labels are pretty static, and can therefore be added early on: | ||
LABEL works.weave.role="system" \ | ||
maintainer="Weaveworks <help@weave.works>" \ | ||
org.opencontainers.image.title="weavedb" \ | ||
org.opencontainers.image.source="https://github.com/weaveworks/weave" \ | ||
org.opencontainers.image.vendor="Weaveworks" | ||
|
||
ENTRYPOINT ["data-only"] | ||
# Work round Docker refusing to save an empty image | ||
COPY Dockerfile / | ||
|
||
# This label will change for every build, and should therefore be the last layer of the image: | ||
ARG revision | ||
LABEL org.opencontainers.image.revision="${revision}" |
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,19 @@ | ||
FROM DOCKERHUB_USER/weaveARCH_EXT | ||
|
||
# These labels are pretty static, and can therefore be added early on: | ||
LABEL maintainer="Weaveworks <help@weave.works>" \ | ||
org.opencontainers.image.title="weaveexec" \ | ||
org.opencontainers.image.source="https://github.com/weaveworks/weave" \ | ||
org.opencontainers.image.vendor="Weaveworks" | ||
|
||
ENTRYPOINT ["/home/weave/sigproxy", "/home/weave/weave"] | ||
|
||
ADD ./sigproxy ./symlink /home/weave/ | ||
ADD ./weavewait /w/w | ||
ADD ./weavewait_noop /w-noop/w | ||
ADD ./weavewait_nomcast /w-nomcast/w | ||
WORKDIR /home/weave | ||
|
||
# This label will change for every build, and should therefore be the last layer of the image: | ||
ARG revision | ||
LABEL org.opencontainers.image.revision="${revision}" |
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