Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Document FROM image[[:<tag>]@<digest>] notation as well #2018

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

gmarik
Copy link

@gmarik gmarik commented Jul 26, 2019

Problem

Seeing usages of comments to document the tag while using @digest notation

// FROM image:1.2.3
FROM image@sha256:9d6ee4c3dd307

But composed notation with tag is valid as well

FROM image:1.2.3@sha256:9d6ee4c3dd307

Solution

Document the composed notation

- Description for the changelog
Document FROM image[[:<tag>]@<digest>] notation as well

- A picture of a cute animal (not mandatory but encouraged)

@GordonTheTurtle
Copy link

Please sign your commits following these rules:
https://github.com/moby/moby/blob/master/CONTRIBUTING.md#sign-your-work
The easiest way to do this is to amend the last commit:

$ git clone -b "patch-1" git@github.com:gmarik/cli.git somewhere
$ cd somewhere
$ git commit --amend -s --no-edit
$ git push -f

Amending updates the existing PR. You DO NOT need to open a new one.

Observing usage of comments to document the tag
```
// FROM image:1.2.3
FROM image@sha256:9d6ee4c3dd307
```

while notation with tag is valid as well
```
FROM image:1.2.3@sha256:9d6ee4c3dd307
```

Signed-off-by: gmarik <gmarik@gmail.com>
@codecov-io
Copy link

Codecov Report

Merging #2018 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #2018   +/-   ##
=======================================
  Coverage   56.79%   56.79%           
=======================================
  Files         311      311           
  Lines       21836    21836           
=======================================
  Hits        12402    12402           
  Misses       8519     8519           
  Partials      915      915

@@ -568,6 +568,10 @@ Or

FROM <image>[@<digest>] [AS <name>]

Or combined(though `<tag>` is ignored)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about
Or combined (if both `<tag>` and `<digest>` are specified, `<digest>` takes precedence) ?

@silvin-lubecki
Copy link
Contributor

Thank you @gmarik for opening this PR! I just left a comment for small rewording 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants