From 8afc76c918a3b67ea1858019bbf66d6cbc10a04f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Pedro=20Algarvio?= Date: Wed, 15 Nov 2017 13:08:05 +0000 Subject: [PATCH 1/2] Added org.label-schema.vendor.* fields --- rc1.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rc1.md b/rc1.md index 1307f1f..b5e1ce6 100644 --- a/rc1.md +++ b/rc1.md @@ -73,6 +73,9 @@ All labels are OPTIONAL, however if present MUST be prefixed with the namespace | `vcs-url` | `org.label-schema.vcs-url = "https://github.com/nginx/nginx"` | URL for the source code under version control from which this container image was built. | | `vcs-ref` | `org.label-schema.vcs-ref = "279FA63"` | Identifier for the version of the source code from which this image was built. For example if the version control system is git this is the SHA. | | `vendor` | `org.label-schema.vendor = "Stark Industries"` | The organization that produces this image. | +| `vendor.name` | `org.label-schema.vendor.name = "ACME Industries"` | The name of the vendor that owns, authored or supports this image. | +| `vendor.email` | `org.label-schema.vendor.email = "support@example.com"` | The email address of vendor that owns, authored or supports this image. | +| `vendor.website` | `org.label-schema.vendor.website = "http://www.example.com"` | The website url of vendor that owns, authored or supports this image. | | `version` | `org.label-schema.version = "1.2.3"` `org.label-schema.version = "Beta4.2"` `org.label-schema.version = "1.2.2-dirty"` `org.label-schema.version = "my-test"` | Release identifier for the contents of the image. This is entirely up to the user and could be a numeric version number like 1.2.3, or a text label.
The version MAY match a label or tag in the source code repository.
You should make sure that only images that exactly reflect a version of code should have that version label. If Julia finds a version 0.7.1 in a repository she SHOULD be able to infer this matches version 0.7.1 of the associated code (and in particular, not 0.7.1 plus some later commits).
You SHOULD omit the version label, or use a marker like "dirty" or "test" to indicate when a container image does not match a labelled / tagged version of the code. | | `schema-version` | `org.label-schema.schema-version = "1.0"` | This label SHOULD be present to indicate the version of Label Schema in use. | | `docker.cmd` | `org.label-schema.docker.cmd= "docker run -d -p 5000:5000 -v config.json:/etc/config.json myapp"` | How to run a container based on the image under the Docker runtime. | From 94866a45975a36099c3acb53123914eb1ddb1a67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Pedro=20Algarvio?= Date: Wed, 15 Nov 2017 13:41:14 +0000 Subject: [PATCH 2/2] Changed nomenclature Changed nomenclature to use hyphen instead of dot as separator. --- rc1.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rc1.md b/rc1.md index b5e1ce6..f177943 100644 --- a/rc1.md +++ b/rc1.md @@ -73,9 +73,9 @@ All labels are OPTIONAL, however if present MUST be prefixed with the namespace | `vcs-url` | `org.label-schema.vcs-url = "https://github.com/nginx/nginx"` | URL for the source code under version control from which this container image was built. | | `vcs-ref` | `org.label-schema.vcs-ref = "279FA63"` | Identifier for the version of the source code from which this image was built. For example if the version control system is git this is the SHA. | | `vendor` | `org.label-schema.vendor = "Stark Industries"` | The organization that produces this image. | -| `vendor.name` | `org.label-schema.vendor.name = "ACME Industries"` | The name of the vendor that owns, authored or supports this image. | -| `vendor.email` | `org.label-schema.vendor.email = "support@example.com"` | The email address of vendor that owns, authored or supports this image. | -| `vendor.website` | `org.label-schema.vendor.website = "http://www.example.com"` | The website url of vendor that owns, authored or supports this image. | +| `vendor-name` | `org.label-schema.vendor-name = "ACME Industries"` | The name of the vendor that owns, authored or supports this image. | +| `vendor-email` | `org.label-schema.vendor-email = "support@example.com"` | The email address of vendor that owns, authored or supports this image. | +| `vendor-website` | `org.label-schema.vendor-website = "http://www.example.com"` | The website url of vendor that owns, authored or supports this image. | | `version` | `org.label-schema.version = "1.2.3"` `org.label-schema.version = "Beta4.2"` `org.label-schema.version = "1.2.2-dirty"` `org.label-schema.version = "my-test"` | Release identifier for the contents of the image. This is entirely up to the user and could be a numeric version number like 1.2.3, or a text label.
The version MAY match a label or tag in the source code repository.
You should make sure that only images that exactly reflect a version of code should have that version label. If Julia finds a version 0.7.1 in a repository she SHOULD be able to infer this matches version 0.7.1 of the associated code (and in particular, not 0.7.1 plus some later commits).
You SHOULD omit the version label, or use a marker like "dirty" or "test" to indicate when a container image does not match a labelled / tagged version of the code. | | `schema-version` | `org.label-schema.schema-version = "1.0"` | This label SHOULD be present to indicate the version of Label Schema in use. | | `docker.cmd` | `org.label-schema.docker.cmd= "docker run -d -p 5000:5000 -v config.json:/etc/config.json myapp"` | How to run a container based on the image under the Docker runtime. |