Skip to content

org.opencontainers.ref.name -> org.opencontainers.image.ref.name#278

Merged
runcom merged 2 commits intocontainers:masterfrom
AkihiroSuda:fix-index
May 26, 2017
Merged

org.opencontainers.ref.name -> org.opencontainers.image.ref.name#278
runcom merged 2 commits intocontainers:masterfrom
AkihiroSuda:fix-index

Conversation

@AkihiroSuda
Copy link
Copy Markdown
Contributor

According to rc6 spec, the annotation was wrong https://github.com/opencontainers/image-spec/blob/v1.0.0-rc6/annotations.md

Signed-off-by: Akihiro Suda suda.akihiro@lab.ntt.co.jp

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
@AkihiroSuda
Copy link
Copy Markdown
Contributor Author

CI failure seems unrelated

vendor/github.com/containers/storage/store.go:18:2: cannot find package "github.com/BurntSushi/toml" in any of:
	/home/travis/gopath/src/github.com/containers/image/vendor/github.com/BurntSushi/toml (vendor tree)
	/home/travis/.gimme/versions/go1.7.linux.amd64/src/github.com/BurntSushi/toml (from $GOROOT)
	/home/travis/gopath/src/github.com/BurntSushi/toml (from $GOPATH)
make: *** [test] Error 1
t
The command "make tools .gitvalidation validate test test-skopeo BUILDTAGS="$BUILDTAGS"" exited with 2.

https://travis-ci.org/containers/image/jobs/236321911

@runcom
Copy link
Copy Markdown
Member

runcom commented May 26, 2017

Thanks a lot for spotting this @AkihiroSuda - actually CI failure is related to the fact that we vendor latest containers/storage master and that introduced toml dep what we're not vendoring. Could you please add it to vendor.conf (do not run vndr then!) and also use a commit hash instead of master for containers/storage in vendor.conf? Thanks

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
@AkihiroSuda
Copy link
Copy Markdown
Contributor Author

done

@runcom
Copy link
Copy Markdown
Member

runcom commented May 26, 2017

LGTM

Approved with PullApprove

@runcom runcom merged commit 84d3787 into containers:master May 26, 2017
@runcom
Copy link
Copy Markdown
Member

runcom commented May 26, 2017

@AkihiroSuda would you open a PR in skopeo to vendor c/image master over there to pull in this change? 👼

Comment thread oci/layout/oci_dest.go

annotations := make(map[string]string)
annotations["org.opencontainers.ref.name"] = d.ref.tag
annotations["org.opencontainers.image.ref.name"] = d.ref.tag
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

actually, I'd rather use what's defined in oci image-spec itself, I'll follow up on this.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

nevermind, they're not defined anywhere lol

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@AkihiroSuda
Copy link
Copy Markdown
Contributor Author

sure containers/skopeo#349

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants