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

Add MediaType in index.json when --out type=oci #4727

Merged
merged 2 commits into from
Mar 4, 2024

Conversation

daghack
Copy link
Collaborator

@daghack daghack commented Mar 1, 2024

Addresses issue #4595 and adds appropriate test. Specifically, this catches the case where tar=false, which is not covered by the incoming containerd fix. ( It should also happen fix the issue more generally, but getting the containerd was the correct fix in the general case. 😄 )

Signed-off-by: Talon Bowler <talon.bowler@docker.com>
}, nil)
require.NoError(t, err)

_, err = os.Stat(filepath.Join(outDir, "index.json"))
Copy link
Member

Choose a reason for hiding this comment

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

nit: Stat here does not seem to be needed. ReadFile would fail with same error if file does not exist.

client/ociindex/ociindex.go Show resolved Hide resolved
Signed-off-by: Talon Bowler <talon.bowler@docker.com>
@tonistiigi tonistiigi merged commit 89e3275 into moby:master Mar 4, 2024
72 checks passed
@daghack daghack deleted the oci-index-fix branch March 25, 2024 15:42
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