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

fix: support parsing manifest config JSON containing data: (#4340) #4346

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −1
Open

fix: support parsing manifest config JSON containing data: (#4340) #4346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions jib-core/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file.
### Changed

### Fixed
- fix: support parsing manifest config JSON containing `data:`. ([#4346](https://github.com/GoogleContainerTools/jib/pull/4346))

## 0.27.2
- fix: allow pushing images with different arch/os to docker daemon [#4265](https://github.com/GoogleContainerTools/jib/issues/4265)
Expand Down
2 changes: 2 additions & 0 deletions 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 @@ -16,6 +16,7 @@

package com.google.cloud.tools.jib.image.json;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.google.cloud.tools.jib.api.DescriptorDigest;
import com.google.cloud.tools.jib.json.JsonTemplate;
import com.google.common.annotations.VisibleForTesting;
Expand All @@ -40,6 +41,7 @@ public interface BuildableManifestTemplate extends ManifestTemplate {
* @see <a href="https://github.com/opencontainers/image-spec/blob/master/descriptor.md">OCI
* Content Descriptors</a>
*/
@JsonIgnoreProperties(ignoreUnknown = true)
class ContentDescriptorTemplate implements JsonTemplate {

@SuppressWarnings("unused")
Expand Down
3 changes: 2 additions & 1 deletion 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 @@ -4,7 +4,8 @@
"config":{
"mediaType": "type",
"digest": "sha256:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
"size": 10
"size": 10,
"data": "eyJhcmNoaXRlY3R1cmUiOiJhbWQ2NCIsImhpc3RvcnkiOltdfQ=="
},
"layers":[
{
Expand Down
1 change: 1 addition & 0 deletions jib-gradle-plugin/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file.
### Changed

### Fixed
- fix: support parsing manifest config JSON containing `data:`. ([#4346](https://github.com/GoogleContainerTools/jib/pull/4346))

## 3.4.4
- fix: allow pushing images with different arch/os to docker daemon [#4265](https://github.com/GoogleContainerTools/jib/issues/4265)
Expand Down
1 change: 1 addition & 0 deletions jib-maven-plugin/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file.
### Changed

### Fixed
- fix: support parsing manifest config JSON containing `data:`. ([#4346](https://github.com/GoogleContainerTools/jib/pull/4346))

## 3.4.4
- fix: allow pushing images with different arch/os to docker daemon [#4265](https://github.com/GoogleContainerTools/jib/issues/4265)
Expand Down