From dc4e866354bc5f0b9a6245f77c32b3889795eb32 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 28 Nov 2023 11:58:14 -0500 Subject: [PATCH 1/2] lib: Update ostree-ext --- Cargo.lock | 72 ++++++++++++++---------------------------------------- 1 file changed, 18 insertions(+), 54 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1902816e62..1d750c013a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -101,19 +101,6 @@ version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" -[[package]] -name = "async-compression" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" -dependencies = [ - "flate2", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", -] - [[package]] name = "async-compression" version = "0.4.0" @@ -242,7 +229,7 @@ dependencies = [ "ambient-authority", "fs-set-times", "io-extras", - "io-lifetimes 2.0.2", + "io-lifetimes", "ipnet", "maybe-owned", "rustix", @@ -259,7 +246,7 @@ dependencies = [ "camino", "cap-primitives", "io-extras", - "io-lifetimes 2.0.2", + "io-lifetimes", "rustix", ] @@ -850,7 +837,7 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd738b84894214045e8414eaded76359b4a5773f0a0a56b16575110739cdcf39" dependencies = [ - "io-lifetimes 2.0.2", + "io-lifetimes", "rustix", "windows-sys 0.48.0", ] @@ -1337,18 +1324,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d3c230ee517ee76b1cc593b52939ff68deda3fae9e41eca426c6b4993df51c4" dependencies = [ - "io-lifetimes 2.0.2", - "windows-sys 0.48.0", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" -dependencies = [ - "hermit-abi 0.3.1", - "libc", + "io-lifetimes", "windows-sys 0.48.0", ] @@ -1424,14 +1400,14 @@ dependencies = [ [[package]] name = "libsystemd" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b9597a67aa1c81a6624603e6bd0bcefb9e0f94c9c54970ec53771082104b4e" +checksum = "c592dc396b464005f78a5853555b9f240bc5378bf5221acc4e129910b2678869" dependencies = [ "hmac", "libc", "log", - "nix 0.26.4", + "nix", "nom", "once_cell", "serde", @@ -1515,18 +1491,18 @@ checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" [[package]] name = "memoffset" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" dependencies = [ "autocfg", ] [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] @@ -1582,18 +1558,6 @@ dependencies = [ "tempfile", ] -[[package]] -name = "nix" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.7.1", -] - [[package]] name = "nix" version = "0.27.1" @@ -1603,6 +1567,7 @@ dependencies = [ "bitflags 2.4.1", "cfg-if", "libc", + "memoffset 0.9.0", ] [[package]] @@ -1771,13 +1736,12 @@ dependencies = [ [[package]] name = "ostree-ext" -version = "0.12.6" +version = "0.12.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62546260800af9524f1d971719d06efa6875f0730cb3830f744f71701b63ae1" +checksum = "b7ff57214b8d77a9bb2d6bf6f8ff45173bec9d5239c7b91ebfd782ba2e2bf8d9" dependencies = [ "anyhow", - "async-compression 0.3.15", - "bitflags 1.3.2", + "async-compression", "camino", "cap-std-ext", "chrono", @@ -1789,7 +1753,7 @@ dependencies = [ "gvariant", "hex", "indicatif", - "io-lifetimes 1.0.10", + "io-lifetimes", "libc", "libsystemd", "olpc-cjson", @@ -2129,7 +2093,7 @@ version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ - "async-compression 0.4.0", + "async-compression", "base64 0.21.0", "bytes", "encoding_rs", @@ -2199,7 +2163,7 @@ dependencies = [ "libc", "libdnf-sys", "maplit", - "nix 0.27.1", + "nix", "once_cell", "openssl", "os-release", From a60e07f8dd054bbed3cb751b01b091f0e5c36400 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 28 Nov 2023 14:50:07 -0500 Subject: [PATCH 2/2] compose: Add support for specifying image config This adds generic support for specifying image configuration. Closes: https://github.com/coreos/rpm-ostree/issues/4701 --- rust/src/compose.rs | 6 ++++++ rust/src/container.rs | 12 ++++++++++++ tests/encapsulate.sh | 15 ++++++++++++++- 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/rust/src/compose.rs b/rust/src/compose.rs index df88066cf2..19a0eca4a4 100644 --- a/rust/src/compose.rs +++ b/rust/src/compose.rs @@ -114,6 +114,11 @@ struct Opt { #[clap(name = "label", long, short)] labels: Vec, + /// Path to container image configuration in JSON format. This is the `config` + /// field of https://github.com/opencontainers/image-spec/blob/main/config.md + #[clap(long)] + image_config: Option, + #[clap(long, value_parser)] /// Update the timestamp or create this file on changes touch_if_changed: Option, @@ -322,6 +327,7 @@ pub(crate) fn compose_image(args: Vec) -> CxxResult<()> { .args(&["compose", "container-encapsulate"]) .args(label_args) .args(previous_arg) + .args(opt.image_config.map(|v| format!("--image-config={v}"))) .args(&[ "--repo", repo.as_str(), diff --git a/rust/src/container.rs b/rust/src/container.rs index da6c8dc38b..958dd57136 100644 --- a/rust/src/container.rs +++ b/rust/src/container.rs @@ -3,6 +3,8 @@ // SPDX-License-Identifier: Apache-2.0 OR MIT use std::collections::{BTreeMap, HashMap, HashSet}; +use std::fs::File; +use std::io::BufReader; use std::num::NonZeroU32; use std::process::Command; use std::rc::Rc; @@ -45,6 +47,11 @@ struct ContainerEncapsulateOpts { #[clap(name = "label", long, short)] labels: Vec, + /// Path to container image configuration in JSON format. This is the `config` + /// field of https://github.com/opencontainers/image-spec/blob/main/config.md + #[clap(long)] + image_config: Option, + /// Propagate an OSTree commit metadata key to container label #[clap(name = "copymeta", long)] copy_meta_keys: Vec, @@ -449,6 +456,11 @@ pub fn container_encapsulate(args: Vec) -> CxxResult<()> { opts.max_layers = opt.max_layers; opts.prior_build = package_structure.as_ref(); opts.contentmeta = Some(&meta); + if let Some(config_path) = opt.image_config.as_deref() { + let config = serde_json::from_reader(File::open(config_path).map(BufReader::new)?) + .map_err(anyhow::Error::msg)?; + opts.container_config = Some(config); + } let handle = tokio::runtime::Handle::current(); let digest = progress_task("Generating container image", || { handle.block_on(async { diff --git a/tests/encapsulate.sh b/tests/encapsulate.sh index 19f2ef1621..f03230eda6 100755 --- a/tests/encapsulate.sh +++ b/tests/encapsulate.sh @@ -16,11 +16,24 @@ cat /etc/ostree/remotes.d/fedora.conf >> repo/config ostree container unencapsulate --write-ref=testref --repo=repo ostree-remote-registry:fedora:$container # Re-pack it as a (chunked) container +cat > config.json << 'EOF' +{ + "Env": [ + "container=oci" + ], + "Labels": { + "usage": "Do not use directly. Use as a base image for daemons. Install chosen packages and 'systemctl enable' them." + }, + "StopSignal": "SIGRTMIN+3" +} +EOF + rpm-ostree compose container-encapsulate --repo=repo \ + --image-config=config.json \ --label=foo=bar --label baz=blah --copymeta-opt fedora-coreos.stream --copymeta-opt nonexistent.key \ testref oci:test.oci skopeo inspect oci:test.oci | jq -r .Labels > labels.json -for label in foo baz 'fedora-coreos.stream'; do +for label in foo baz 'fedora-coreos.stream' usage; do jq -re ".\"${label}\"" < labels.json done echo ok