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

feat(oci): inline content when applicable by default #1821

Merged
merged 1 commit into from
Oct 2, 2023
+1 −7
Merged

feat(oci): inline content when applicable by default #1821

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
8 changes: 1 addition & 7 deletions crates/oci/src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,6 @@ impl Client {
auth: RegistryAuth,
reference: Reference,
) -> Result<Option<String>> {
// Opt-in to omitting layers for files that have been inlined into the manifest.
// TODO: After full integration this can be turned on by default.
let skip_inlined_files = !std::env::var_os("SPIN_OCI_SKIP_INLINED_FILES")
.unwrap_or_default()
.is_empty();

// For each component in the application, add layers for the wasm module and
// all static assets and update the locked application with the file digests.
let mut layers = Vec::new();
Expand Down Expand Up @@ -157,7 +151,7 @@ impl Client {
// As a workaround for OCI implementations that don't support very small blobs,
// don't push very small content that has been inlined into the manifest:
// https://github.com/distribution/distribution/discussions/4029
let skip_layer = skip_inlined_files && content_inline;
let skip_layer = content_inline;
if !skip_layer {
layers.push(layer);
}
Expand Down