Skip to content
This repository has been archived by the owner on Nov 1, 2022. It is now read-only.

Commit

Permalink
Merge pull request #1075 from weaveworks/add-opencontainers-labels-to…
Browse files Browse the repository at this point in the history
…-dockerfiles

Add org.opencontainers.image.* labels to Dockerfiles
  • Loading branch information
marccarre authored May 11, 2018
2 parents 6cffe7e + b719f64 commit 0af44c5
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 6 deletions.
14 changes: 11 additions & 3 deletions docker/Dockerfile.flux
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
FROM alpine:3.6

# These are pretty static
LABEL org.label-schema.schema-version="1.0" \
LABEL maintainer="Weaveworks <[email protected]>" \
org.opencontainers.image.title="flux" \
org.opencontainers.image.description="The Flux daemon, for synchronising your cluster with a git repo, and deploying new images" \
org.opencontainers.image.url="https://github.com/weaveworks/flux" \
org.opencontainers.image.source="[email protected]:weaveworks/flux" \
org.opencontainers.image.vendor="Weaveworks" \
org.label-schema.schema-version="1.0" \
org.label-schema.name="flux" \
org.label-schema.description="The Flux daemon, for synchronising your cluster with a git repo, and deploying new images" \
org.label-schema.url="https://github.com/weaveworks/flux" \
Expand All @@ -28,5 +34,7 @@ ARG BUILD_DATE
ARG VCS_REF

# These will change for every build
LABEL org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.build-date=$BUILD_DATE
LABEL org.opencontainers.image.revision="$VCS_REF" \
org.opencontainers.image.created="$BUILD_DATE" \
org.label-schema.vcs-ref="$VCS_REF" \
org.label-schema.build-date="$BUILD_DATE"
14 changes: 11 additions & 3 deletions docker/Dockerfile.helm-operator
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
FROM alpine:3.6

# These are pretty static
LABEL org.label-schema.schema-version="1.0" \
LABEL maintainer="Weaveworks <[email protected]>" \
org.opencontainers.image.title="flux-helm-operator" \
org.opencontainers.image.description="The Flux Helm operator, for releasing Helm charts according to git" \
org.opencontainers.image.url="https://github.com/weaveworks/flux" \
org.opencontainers.image.source="[email protected]:weaveworks/flux" \
org.opencontainers.image.vendor="Weaveworks" \
org.label-schema.schema-version="1.0" \
org.label-schema.name="flux-helm-operator" \
org.label-schema.description="The Flux Helm operator, for releasing Helm charts according to git" \
org.label-schema.url="https://github.com/weaveworks/flux" \
Expand All @@ -28,5 +34,7 @@ ARG BUILD_DATE
ARG VCS_REF

# These will change for every build
LABEL org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.build-date=$BUILD_DATE
LABEL org.opencontainers.image.revision="$VCS_REF" \
org.opencontainers.image.created="$BUILD_DATE" \
org.label-schema.vcs-ref="$VCS_REF" \
org.label-schema.build-date="$BUILD_DATE"

0 comments on commit 0af44c5

Please sign in to comment.