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

Update labels in Dockerfiles to match fluxcd org #2244

Merged
merged 1 commit into from
Jul 10, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 9 additions & 9 deletions docker/Dockerfile.flux
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@ COPY ./kubectl /usr/local/bin/
COPY ./kustomize /usr/local/bin

# These are pretty static
LABEL maintainer="Weaveworks <[email protected]>" \
LABEL maintainer="Flux CD <https://github.com/fluxcd/flux/issues>" \
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.opencontainers.image.description="The GitOps operator for Kubernetes" \
org.opencontainers.image.url="https://github.com/fluxcd/flux" \
org.opencontainers.image.source="[email protected]:fluxcd/flux" \
org.opencontainers.image.vendor="Flux CD" \
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" \
org.label-schema.vcs-url="[email protected]:weaveworks/flux" \
org.label-schema.vendor="Weaveworks"
org.label-schema.description="The GitOps operator for Kubernetes" \
org.label-schema.url="https://github.com/fluxcd/flux" \
org.label-schema.vcs-url="[email protected]:fluxcd/flux" \
org.label-schema.vendor="Flux CD"

ENTRYPOINT [ "/sbin/tini", "--", "fluxd" ]

Expand Down
18 changes: 9 additions & 9 deletions docker/Dockerfile.helm-operator
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@ COPY ./kubectl /usr/local/bin/
COPY ./helm /usr/local/bin/

# These are pretty static
LABEL maintainer="Weaveworks <[email protected]>" \
LABEL maintainer="Flux CD <https://github.com/fluxcd/flux/issues>" \
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.opencontainers.image.description="The Helm operator for Kubernetes" \
org.opencontainers.image.url="https://github.com/fluxcd/flux" \
org.opencontainers.image.source="[email protected]:fluxcd/flux" \
org.opencontainers.image.vendor="Flux CD" \
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" \
org.label-schema.vcs-url="[email protected]:weaveworks/flux" \
org.label-schema.vendor="Weaveworks"
org.label-schema.description="The Helm operator for Kubernetes" \
org.label-schema.url="https://github.com/fluxcd/flux" \
org.label-schema.vcs-url="[email protected]:fluxcd/flux" \
org.label-schema.vendor="Flux CD"

ENTRYPOINT [ "/sbin/tini", "--", "helm-operator" ]

Expand Down