Aligning Docker version between containers/image and skopeo #440
Conversation
mtrmac
left a comment
mtrmac
left a comment
There was a problem hiding this comment.
(ACK on the skopeo changes otherwise.)
vendor.conf.tmp
Outdated
| @@ -0,0 +1,46 @@ | |||
| github.com/urfave/cli v1.17.0 | |||
hferentschik
force-pushed
the
container-image-issue-327
branch
from
8cb6a41 to
e1f971e
Compare
vendor.conf
Outdated
| @@ -1,23 +1,25 @@ | |||
| github.com/urfave/cli v1.17.0 | |||
| github.com/containers/image master | |||
| github.com/containers/image issue-327 https://github.com/hferentschik/image.git | |||
There was a problem hiding this comment.
can you vendor this from master again?
There was a problem hiding this comment.
Sorry, that was my intention
vendor.conf
Outdated
| gopkg.in/cheggaaa/pb.v1 ad4efe000aa550bb54918c06ebbadc0ff17687b9 https://github.com/cheggaaa/pb | ||
| github.com/containers/storage master | ||
| github.com/sirupsen/logrus v1.0.0 | ||
| github.com/Sirupsen/logrus v1.0.0 |
There was a problem hiding this comment.
mmm which of these is correct? why do we have both?
There was a problem hiding this comment.
github.com/sirupsen/logrus v1.0.0 is the correct one now. There was a major issue around logrus when it got renamed from github.com/Sirupsen/logrus to github.com/sirupsen/logrus.
There was a problem hiding this comment.
right, my question was more "should we keep both?!"
Signed-off-by: Hardy Ferentschik <[email protected]>
hferentschik
force-pushed
the
container-image-issue-327
branch
from
e1f971e to
4125d74
Compare
|
@runcom pushed an update |
looks ok locally, will merge after Travis is done testing. Thanks! |
|
Thanks |
mtrmac
left a comment
mtrmac
left a comment
There was a problem hiding this comment.
Something weird has happened with the vendoring process here, which would cause the next re-vendor to break things AFAICT.
I’ll submit an update to fix these parts momentarily, but it still seems useful to figure out how this happened / how to prevent it in the future.
| # -- start OCI image validation requirements. | ||
| github.com/opencontainers/runtime-spec v1.0.0 | ||
| github.com/opencontainers/image-tools 6d941547fa1df31900990b3fb47ec2468c9c6469 | ||
| github.com/opencontainers/image-tools da84dc9dddc823a32f543e60323f841d12429c51 |
There was a problem hiding this comment.
This reverts image-tools to an older commit, notably using upper-case Sirupsen. But this commit does not actually update the vendored package?!
| golang.org/x/sys master | ||
| github.com/tchap/go-patricia v2.2.6 | ||
| github.com/BurntSushi/toml master | ||
| github.com/pquerna/ffjson d49c2bc1aa135aad0c6f4fc2056623ec78f5d5ac |
There was a problem hiding this comment.
And this removed item also does not correspond to removing any files from vendor?!
mtrmac
changed the title
|
@mtrmac thanks for spotting that |
PR containers#440 reverted the vendor.conf edits of containers#426. This passed CI because the corresponding vendor/* subpackages were not modified. Restore the vendor.conf changes, and re-run full (vndr) to ensure the two are consistent again. Signed-off-by: Miloslav Trmač <[email protected]>
PR containers#440 reverted the vendor.conf edits of containers#426. This passed CI because the corresponding vendor/* subpackages were not modified. Restore the vendor.conf changes, and re-run full (vndr) to ensure the two are consistent again. Signed-off-by: Miloslav Trmač <[email protected]>
PR containers#440 reverted the vendor.conf edits of containers#426. This passed CI because the corresponding vendor/* subpackages were not modified. Restore the vendor.conf changes, and re-run full (vndr) to ensure the two are consistent again. Signed-off-by: Miloslav Trmač <[email protected]>
3 participants
See also containers/image#328