diff --git a/Dockerfile b/Dockerfile index 3c7146e..b7d37df 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,13 +31,17 @@ ARG VERSION ARG TARGETARCH ARG TARGETOS -LABEL name=${BIN_NAME} \ - maintainer="Team Consul Kubernetes " \ - vendor="HashiCorp" \ - version=${VERSION} \ - release=${VERSION} \ - summary="rollouts-plugin-trafficrouter-consul is a plugin for Argo Rollouts." \ - description="rollouts-plugin-trafficrouter-consul is a plugin for Argo Rollouts." +LABEL maintainer="Team Consul Kubernetes " \ + org.opencontainers.image.title=${BIN_NAME} \ + org.opencontainers.image.description="rollouts-plugin-trafficrouter-consul is a plugin for Argo Rollouts." \ + org.opencontainers.image.authors="Team Consul Kubernetes " \ + org.opencontainers.image.version=${PRODUCT_VERSION} \ + org.opencontainers.image.revision=${PRODUCT_REVISION} \ + org.opencontainers.image.vendor="HashiCorp" \ + org.opencontainers.image.licenses="BUSL-1.1" + +RUN mkdir -p /usr/share/doc/plugin +COPY LICENSE /usr/share/doc/plugin/LICENSE.txt # Set ARGs as ENV so that they can be used in ENTRYPOINT/CMD ENV BIN_NAME=${BIN_NAME} diff --git a/makefile b/makefile index 3b32bbc..da64b02 100644 --- a/makefile +++ b/makefile @@ -77,7 +77,7 @@ endif # The help target prints out all targets with their descriptions organized # beneath their categories. The categorises are represented by '##@' and the # target descriptions by '##'. The awk commands is responsible for reading the -# entire set of makefiles included in this invocation, looking for lines of the +# entire set of makefiles included in this invocation, looking for li`nes of the # file as xyz: ## something, and then pretty-format the target and help. Then, # if there's a line with ##@ something, that gets pretty-printed as a category. # More info on the usage of ANSI control characters for terminal formatting: