Skip to content

Commit bd0e66f

Browse files
committed
container: Add application layer to the correct end of the layer stack
containertool currently adds the app layer to the beginning of the layer stack array in the manifest. This results in the app layer being the first to be unpacked, with the others stacked on top. We can show this by adding a plain text file as the executable. If we stack another layer on top with a file of the same name, it should replace the underlying one but it does not: echo first > bar swift run containertool --repository localhost:5555/bar bar podman run --pull=always -it --rm --entrypoint=cat localhost:5555/bar:latest bar # prints: first echo second > bar swift run containertool --repository localhost:5555/bar bar --from localhost:5555/bar:latest podman run --pull=always -it --rm --entrypoint=cat localhost:5555/bar:latest bar # prints: first # should print: second Currently containertool is only used to add the application binary to the application layer. This bug will only cause a problem if the base layer adds a binary at the same path, because this will override the application. This bug probably arose because the specification for the rootfs.diff_ids field of the image configuration defines the layers as being "in order from first to last", which could be read ambiguously: https://github.com/opencontainers/image-spec/blob/main/config.md?plain=1#L220-L222 The specification for the manifest.layers field is much more explicit about the ordering: https://github.com/opencontainers/image-spec/blob/fbb4662eb53b80bd38f7597406cf1211317768f0/manifest.md?plain=1#L70-L71 This with this change, the second build and container run in the example above prints "second" as expected.
1 parent 4d59510 commit bd0e66f

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

Sources/containertool/containertool.swift

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -161,12 +161,10 @@ enum AllowHTTP: String, ExpressibleByArgument, CaseIterable { case source, desti
161161
config: inherited_config,
162162
rootfs: .init(
163163
_type: "layers",
164-
diff_ids: [
165-
// The diff_id is the digest of the _uncompressed_ layer archive.
166-
// It is used by the runtime, which might not store the layers in
167-
// the compressed form in which it received them from the registry.
168-
digest(of: tardiff)
169-
] + baseimage_config.rootfs.diff_ids
164+
// The diff_id is the digest of the _uncompressed_ layer archive.
165+
// It is used by the runtime, which might not store the layers in
166+
// the compressed form in which it received them from the registry.
167+
diff_ids: baseimage_config.rootfs.diff_ids + [digest(of: tardiff)]
170168
),
171169
history: [.init(created: timestamp, created_by: "containertool")]
172170
)
@@ -184,7 +182,7 @@ enum AllowHTTP: String, ExpressibleByArgument, CaseIterable { case source, desti
184182
schemaVersion: 2,
185183
mediaType: "application/vnd.oci.image.manifest.v1+json",
186184
config: config_blob,
187-
layers: [application_layer] + baseimage_manifest.layers
185+
layers: baseimage_manifest.layers + [application_layer]
188186
)
189187

190188
// MARK: Upload base image

0 commit comments

Comments
 (0)