Update containers/storage and containers/image #187
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rhatdan
reviewed
Jul 13, 2017
commit.go
Outdated
| @@ -116,10 +130,10 @@ func (b *Builder) shallowCopy(dest types.ImageReference, src types.ImageReferenc | |||
| Size: int64(len(config)), | |||
| } | |||
| _, err = destImage.PutBlob(bytes.NewReader(config), configBlobInfo) | |||
| if err != nil && len(config) > 0 { | |||
| if err != nil { | |||
There was a problem hiding this comment.
Merge into a single line.
if _, err := destImage.PutBlob(bytes.NewReader(config), configBlobInfo); err != nil {
rhatdan
reviewed
Jul 13, 2017
commit.go
Outdated
| } | ||
| defer layerDiff.Close() | ||
| // Write a copy of the layer as a blob, for the new image to reference. | ||
| _, err = destImage.PutBlob(layerDiff, types.BlobInfo{Digest: "", Size: -1}) |
rhatdan
reviewed
Jul 13, 2017
commit.go
Outdated
| case archive.Bzip2: | ||
| // Until the image specs define a media type for bzip2-compressed layers, even if we know | ||
| // how to decompress them, we can't try to compress layers with bzip2. | ||
| return errors.New("media type for bzip2-compressed layers is not defined") |
There was a problem hiding this comment.
We'd still have to wrap it to indicate what it is that isn't supported... sure, why not.
|
Updated. |
|
I hit the easy to understand stuff, have to rely on the Test suites for the rest. LGTM |
nalind
force-pushed
the
storage-update
branch
10 times, most recently
from
8e6861c to
7446c9a
Compare
|
☔ The latest upstream changes (presumably b9b2a8a) made this pull request unmergeable. Please resolve the merge conflicts. |
nalind
force-pushed
the
storage-update
branch
4 times, most recently
from
3414a75 to
199d77b
Compare
nalind
force-pushed
the
storage-update
branch
2 times, most recently
from
b3d18b1 to
b872b7d
Compare
|
☔ The latest upstream changes (presumably be5bcd5) made this pull request unmergeable. Please resolve the merge conflicts. |
|
@nalind needs rebase. |
nalind
force-pushed
the
storage-update
branch
2 times, most recently
from
3aa0c22 to
84a7705
Compare
|
☔ The latest upstream changes (presumably 15792b2) made this pull request unmergeable. Please resolve the merge conflicts. |
nalind
force-pushed
the
storage-update
branch
2 times, most recently
from
3b19abf to
c3b4855
Compare
nalind
force-pushed
the
storage-update
branch
5 times, most recently
from
36ff9a0 to
8a80d89
Compare
Update containers/image and containers/storage to current master (17449738f2bb4c6375c20dcdcfe2a6cccf03f312 and 0d32dfce498e06c132c60dac945081bf44c22464, respectively). Also updates github.com/docker/docker, golang.org/x/sys, and golang.org/x/text. Signed-off-by: Nalin Dahyabhai <[email protected]>
Update shallowCopy() to work with the newer version of image. Remove things from Push() that we don't need to do any more. Preserve digests in image names, make sure we update creation times, and add a test to ensure that we can pull, commit, and push using such names as sources. Signed-off-by: Nalin Dahyabhai <[email protected]>
nalind
force-pushed
the
storage-update
branch
from
8a80d89 to
b5f18b0
Compare
nalind
changed the title
|
@rhatdan, @TomSweeneyRedHat, is there anything you want changed here? |
|
LGTM and I know it fixes up a number of older issues. I'm also trusting in the tests to shake stuff out. I'd say push the big red button. |
|
LGTM |
|
📌 Commit b5f18b0 has been approved by |
|
⚡ Test exempted: pull fully rebased and already tested. |
rh-atomic-bot
pushed a commit
that referenced
this pull request
Dec 14, 2017
Update shallowCopy() to work with the newer version of image. Remove things from Push() that we don't need to do any more. Preserve digests in image names, make sure we update creation times, and add a test to ensure that we can pull, commit, and push using such names as sources. Signed-off-by: Nalin Dahyabhai <[email protected]> Closes: #187 Approved by: rhatdan
nalind
referenced
this pull request
in nalind/buildah
Dec 14, 2017
Update shallowCopy() to work with the newer version of image. Remove things from Push() that we don't need to do any more. Preserve digests in image names, make sure we update creation times, and add a test to ensure that we can pull, commit, and push using such names as sources. Signed-off-by: Nalin Dahyabhai <[email protected]> Closes: #187 Approved by: rhatdan Signed-off-by: Nalin Dahyabhai <[email protected]>
nalind
referenced
this pull request
in nalind/buildah
Dec 14, 2017
Since we merged #187, push-by-ID should work for images with schema 1 manifests. Signed-off-by: Nalin Dahyabhai <[email protected]>
nalind
pushed a commit
that referenced
this pull request
Apr 2, 2018
Also add buildah as a requirement so that kpod build tests will run Signed-off-by: Daniel J Walsh <[email protected]> Closes: #187 Approved by: mheon
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This bumps the versions of containers/storage and containers/image that we use, and updates the shortcuts that we take when committing to local storage to compensate for assumptions that it made which are no longer true (now it makes different ones).