Skip to content

Expose mediaType on ContentDescriptorTemplate #4499

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

Open
Sboti03 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Expose mediaType on ContentDescriptorTemplate #4499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78689e3
refactor: expose mediaType on ContentDescriptorTemplate
Sboti03 Apr 1, 2026
9c1455d
refactor: expose mediaType on ContentDescriptorTemplate
Sboti03 Apr 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion jib-core/src/main/java/com/google/cloud/tools/jib/image/json/BuildableManifestTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ public interface BuildableManifestTemplate extends ManifestTemplate {
*/
class ContentDescriptorTemplate implements JsonTemplate {

@SuppressWarnings("unused")
@Nullable
private String mediaType;

Expand All @@ -61,6 +60,11 @@ class ContentDescriptorTemplate implements JsonTemplate {
@SuppressWarnings("unused")
protected ContentDescriptorTemplate() {}

@Nullable
public String getMediaType() {
return mediaType;
}

public long getSize() {
return size;
}
Expand Down
8 changes: 6 additions & 2 deletions jib-core/src/test/java/com/google/cloud/tools/jib/image/json/OciManifestTemplateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,15 @@ public void testFromJson() throws IOException, URISyntaxException, DigestExcepti

Assert.assertEquals(1000, manifestJson.getContainerConfiguration().getSize());

BuildableManifestTemplate.ContentDescriptorTemplate layer = manifestJson.getLayers().get(0);

Assert.assertEquals(
DescriptorDigest.fromHash(
"4945ba5011739b0b98c4a41afe224e417f47c7c99b2ce76830999c9a0861b236"),
manifestJson.getLayers().get(0).getDigest());
layer.getDigest());

Assert.assertEquals(1000_000, layer.getSize());

Assert.assertEquals(1000_000, manifestJson.getLayers().get(0).getSize());
Assert.assertEquals("application/vnd.oci.image.manifest.v1+json", layer.getMediaType());
}
}
8 changes: 6 additions & 2 deletions jib-core/src/test/java/com/google/cloud/tools/jib/image/json/V22ManifestTemplateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,16 @@ public void testFromJson() throws IOException, URISyntaxException, DigestExcepti

Assert.assertEquals(1000, manifestJson.getContainerConfiguration().getSize());

ContentDescriptorTemplate layer = manifestJson.getLayers().get(0);

Assert.assertEquals(
DescriptorDigest.fromHash(
"4945ba5011739b0b98c4a41afe224e417f47c7c99b2ce76830999c9a0861b236"),
manifestJson.getLayers().get(0).getDigest());
layer.getDigest());

Assert.assertEquals(1000_000, layer.getSize());

Assert.assertEquals(1000_000, manifestJson.getLayers().get(0).getSize());
Assert.assertEquals("application/vnd.docker.image.rootfs.diff.tar.gzip", layer.getMediaType());
}

@Test
Expand Down
5 changes: 5 additions & 0 deletions jib-core/src/test/resources/core/json/v22manifest_optional_properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@
"size": 4,
"urls": ["cool-url"],
"annotations": {"key1":"value1", "key2":"value2"}
},
{
"mediaType": "application/vnd.docker.image.rootfs.diff.tar.gzip",
"digest": "sha256:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
"size": 5
}
]
}