From 782192a6e50bacd73dcd2e9f9128f1708435b555 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Tue, 4 May 2021 09:45:10 -0700 Subject: [PATCH] Swap "LABEL maintainer" for the OCI pre-defined "org.opencontainers.image.authors" https://github.com/opencontainers/image-spec/blob/v1.0.1/annotations.md#pre-defined-annotation-keys Signed-off-by: Tianon Gravi --- docs/reference/builder.md | 2 +- docs/reference/commandline/pull.md | 2 +- man/src/image/pull.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/reference/builder.md b/docs/reference/builder.md index 07e6e241cb..d5651db8ea 100644 --- a/docs/reference/builder.md +++ b/docs/reference/builder.md @@ -963,7 +963,7 @@ easily, for example with `docker inspect`. To set a label corresponding to the `MAINTAINER` field you could use: ```dockerfile -LABEL maintainer="SvenDowideit@home.org.au" +LABEL org.opencontainers.image.authors="SvenDowideit@home.org.au" ``` This will then be visible from `docker inspect` with the other labels. diff --git a/docs/reference/commandline/pull.md b/docs/reference/commandline/pull.md index 40cc99ff7d..7d02c356e6 100644 --- a/docs/reference/commandline/pull.md +++ b/docs/reference/commandline/pull.md @@ -160,7 +160,7 @@ Digest can also be used in the `FROM` of a Dockerfile, for example: ```dockerfile FROM ubuntu@sha256:45b23dee08af5e43a7fea6c4cf9c25ccf269ee113168c19722f87876677c5cb2 -LABEL maintainer="some maintainer " +LABEL org.opencontainers.image.authors="some maintainer " ``` > **Note** diff --git a/man/src/image/pull.md b/man/src/image/pull.md index 3c9c9dd6b1..13d601e99f 100644 --- a/man/src/image/pull.md +++ b/man/src/image/pull.md @@ -111,7 +111,7 @@ pull the above image by digest, run the following command: Digest can also be used in the `FROM` of a Dockerfile, for example: FROM ubuntu@sha256:45b23dee08af5e43a7fea6c4cf9c25ccf269ee113168c19722f87876677c5cb2 - LABEL maintainer="some maintainer " + LABEL org.opencontainers.image.authors="some maintainer " > **Note**: Using this feature "pins" an image to a specific version in time. > Docker will therefore not pull updated versions of an image, which may include