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.

Sign up for GitHub

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

Jump to bottom

[18.06] Fix manifest lists to always use correct size #1183

Merged
merged 1 commit into from
Jul 3, 2018
Merged

[18.06] Fix manifest lists to always use correct size #1183

merged 1 commit into from
Jul 3, 2018

Conversation

andrewhsu
Copy link
Contributor

- What I did

backport:

- How I did it

$ git cherry-pick -s -x 1fd2d66df89890ca7d830a862d66e1275337ef65
[manifest 15695813a] Fix manifest lists to always use correct size
 Author: Derek McGowan <derek@mcgstyle.net>
 Date: Thu Jun 28 17:41:47 2018 -0700
 9 files changed, 161 insertions(+), 82 deletions(-)

no conflicts

- How to verify it

$ make -f docker.Makefile test-unit

- Description for the changelog

  • Fix manifest lists to always use correct size.

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

@dmcgowan @andrewhsu
Fix manifest lists to always use correct size
1569581 
Stores complete OCI descriptor instead of digest and platform
fields. This includes the size which was getting lost by not
storing the original manifest bytes.

Attempt to support existing cached files, if not output
the filename with the incorrect content.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
(cherry picked from commit 1fd2d66)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
@andrewhsu andrewhsu added this to the 18.06.0 milestone Jul 3, 2018
@andrewhsu andrewhsu requested review from dmcgowan and tonistiigi July 3, 2018 22:35
tiborvass
tiborvass approved these changes Jul 3, 2018
View reviewed changes
Copy link
Collaborator

@tiborvass tiborvass left a comment

Choose a reason for hiding this comment

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

LGTM

thaJeztah
thaJeztah approved these changes Jul 3, 2018
View reviewed changes
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@thaJeztah thaJeztah merged commit 0627568 into docker:18.06 Jul 3, 2018
@andrewhsu andrewhsu deleted the manifest branch July 5, 2018 17:29
@mkumatag mkumatag mentioned this pull request Jul 10, 2018
Merged
@dims dims mentioned this pull request Aug 6, 2018
Closed
dims added a commit to dims/kubernetes that referenced this pull request Aug 7, 2018
@dims
Bail out if wrong version of docker cli is used
07bac1b 
Docker CLI was recently patched to get the manifest generation to work
properly:
docker/cli@1fd2d66
docker/cli#1183

So we need at least 18.06 for the manifests to work. Add some version
checking just before we publish manifests to make sure folks use the
right version.

Change-Id: Idca66da94fba2bae2480413444886c65f11249bf
@dims dims mentioned this pull request Aug 7, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thaJeztah thaJeztah thaJeztah approved these changes

@tiborvass tiborvass tiborvass approved these changes

@dmcgowan dmcgowan Awaiting requested review from dmcgowan

@tonistiigi tonistiigi Awaiting requested review from tonistiigi

Assignees
No one assigned
Labels
impact/changelog kind/experimental status/2-code-review
Projects
None yet
Milestone
18.06.0
Development

Successfully merging this pull request may close these issues.
5 participants
@andrewhsu @tiborvass @thaJeztah @GordonTheTurtle @dmcgowan