Skip to content

Commit 0306346

Browse files
authored
Merge pull request #1821 from vdice/feat/oci-inline-default
feat(oci): inline content when applicable by default
2 parents 56e6e17 + ebf8d89 commit 0306346

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

crates/oci/src/client.rs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,6 @@ impl Client {
100100
auth: RegistryAuth,
101101
reference: Reference,
102102
) -> Result<Option<String>> {
103-
// Opt-in to omitting layers for files that have been inlined into the manifest.
104-
// TODO: After full integration this can be turned on by default.
105-
let skip_inlined_files = !std::env::var_os("SPIN_OCI_SKIP_INLINED_FILES")
106-
.unwrap_or_default()
107-
.is_empty();
108-
109103
// For each component in the application, add layers for the wasm module and
110104
// all static assets and update the locked application with the file digests.
111105
let mut layers = Vec::new();
@@ -157,7 +151,7 @@ impl Client {
157151
// As a workaround for OCI implementations that don't support very small blobs,
158152
// don't push very small content that has been inlined into the manifest:
159153
// https://github.com/distribution/distribution/discussions/4029
160-
let skip_layer = skip_inlined_files && content_inline;
154+
let skip_layer = content_inline;
161155
if !skip_layer {
162156
layers.push(layer);
163157
}

0 commit comments

Comments
 (0)