Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3082 from tianon/oci-authors 

Swap "LABEL maintainer" for the OCI pre-defined "org.opencontainers.image.authors"
This commit is contained in:
Silvin Lubecki 2021-05-18 21:57:42 +02:00 committed by GitHub
parent 67dde4ebbd 782192a6e5
commit 25952c90ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/reference/builder.md
View File

@ -963,7 +963,7 @@ easily, for example with `docker inspect`. To set a label corresponding to the
`MAINTAINER` field you could use: `MAINTAINER` field you could use:
```dockerfile ```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. This will then be visible from `docker inspect` with the other labels.

2
docs/reference/commandline/pull.md
View File

@ -160,7 +160,7 @@ Digest can also be used in the `FROM` of a Dockerfile, for example:
```dockerfile ```dockerfile
FROM ubuntu@sha256:45b23dee08af5e43a7fea6c4cf9c25ccf269ee113168c19722f87876677c5cb2 FROM ubuntu@sha256:45b23dee08af5e43a7fea6c4cf9c25ccf269ee113168c19722f87876677c5cb2
LABEL maintainer="some maintainer <maintainer@example.com>" LABEL org.opencontainers.image.authors="some maintainer <maintainer@example.com>"
``` ```
> **Note** > **Note**

2
man/src/image/pull.md
View File

@ -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: Digest can also be used in the `FROM` of a Dockerfile, for example:
FROM ubuntu@sha256:45b23dee08af5e43a7fea6c4cf9c25ccf269ee113168c19722f87876677c5cb2 FROM ubuntu@sha256:45b23dee08af5e43a7fea6c4cf9c25ccf269ee113168c19722f87876677c5cb2
LABEL maintainer="some maintainer <maintainer@example.com>" LABEL org.opencontainers.image.authors="some maintainer <maintainer@example.com>"
> **Note**: Using this feature "pins" an image to a specific version in time. > **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 > Docker will therefore not pull updated versions of an image, which may include