From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 1CF911FF17C for ; Wed, 9 Jul 2025 14:35:11 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9C32CB479; Wed, 9 Jul 2025 14:35:31 +0200 (CEST) From: Filip Schauer To: pve-devel@lists.proxmox.com Date: Wed, 9 Jul 2025 14:34:20 +0200 Message-ID: <20250709123435.64796-4-f.schauer@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250709123435.64796-1-f.schauer@proxmox.com> References: <20250709123435.64796-1-f.schauer@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.065 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment PROLO_LEO1 0.1 Meta Catches all Leo drug variations so far RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [oci.rs, mod.rs, genpackage.pl] Subject: [pve-devel] [PATCH proxmox-perl-rs v3 03/13] add Perl mapping for OCI container image parser/extractor X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Signed-off-by: Filip Schauer --- This patch depends on the proxmox-oci crate added in patch 02/13. Changed since v2: * rebase onto newest master (6132d4d36cbd) * forward all errors to Perl * remove oci-spec dependency Changed since v1: * rebase on latest master (3d9806cb3c7f) * add new dependencies to debian/control pve-rs/Cargo.toml | 1 + pve-rs/Makefile | 1 + pve-rs/debian/control | 1 + pve-rs/src/bindings/mod.rs | 3 +++ pve-rs/src/bindings/oci.rs | 21 +++++++++++++++++++++ 5 files changed, 27 insertions(+) create mode 100644 pve-rs/src/bindings/oci.rs diff --git a/pve-rs/Cargo.toml b/pve-rs/Cargo.toml index c7f11a3..4d38a5c 100644 --- a/pve-rs/Cargo.toml +++ b/pve-rs/Cargo.toml @@ -37,6 +37,7 @@ proxmox-http = { version = "1", features = ["client-sync", "client-trait"] } proxmox-http-error = "1" proxmox-log = "1" proxmox-notify = { version = "1", features = ["pve-context"] } +proxmox-oci = "0.1.0" proxmox-openid = "1" proxmox-resource-scheduling = "1" proxmox-shared-cache = "1" diff --git a/pve-rs/Makefile b/pve-rs/Makefile index 773156a..d813766 100644 --- a/pve-rs/Makefile +++ b/pve-rs/Makefile @@ -27,6 +27,7 @@ PERLMOD_GENPACKAGE := /usr/lib/perlmod/genpackage.pl \ PERLMOD_PACKAGES := \ PVE::RS::Firewall::SDN \ + PVE::RS::OCI \ PVE::RS::OpenId \ PVE::RS::ResourceScheduling::Static \ PVE::RS::TFA diff --git a/pve-rs/debian/control b/pve-rs/debian/control index 9e424ec..869ca50 100644 --- a/pve-rs/debian/control +++ b/pve-rs/debian/control @@ -24,6 +24,7 @@ Build-Depends: cargo:native , librust-proxmox-log-1+default-dev, librust-proxmox-notify-1+default-dev (>= 0.5.4), librust-proxmox-notify-1+pve-context-dev, + librust-proxmox-oci-0.1+default-dev, librust-proxmox-openid-1+default-dev (>= 0.10.4-~~), librust-proxmox-resource-scheduling-1+default-dev, librust-proxmox-shared-cache-1+default-dev, diff --git a/pve-rs/src/bindings/mod.rs b/pve-rs/src/bindings/mod.rs index e4fb4db..17247f6 100644 --- a/pve-rs/src/bindings/mod.rs +++ b/pve-rs/src/bindings/mod.rs @@ -1,5 +1,8 @@ //! This contains all the perl bindings. +mod oci; +pub use oci::pve_rs_oci; + mod resource_scheduling_static; pub use resource_scheduling_static::pve_rs_resource_scheduling_static; diff --git a/pve-rs/src/bindings/oci.rs b/pve-rs/src/bindings/oci.rs new file mode 100644 index 0000000..f7cfe41 --- /dev/null +++ b/pve-rs/src/bindings/oci.rs @@ -0,0 +1,21 @@ +#[perlmod::package(name = "PVE::RS::OCI")] +pub mod pve_rs_oci { + //! The `PVE::RS::OCI` package. + //! + //! Provides bindings for the proxmox-oci crate. + + use anyhow::Error; + use proxmox_oci::Config; + + /// Method: Extract the rootfs of an OCI image tar and return the image config. + #[export] + pub fn parse_and_extract_image( + oci_tar_path: &str, + rootfs_path: &str, + ) -> Result, Error> { + match proxmox_oci::parse_and_extract_image(oci_tar_path, rootfs_path) { + Ok(config) => Ok(Some(config.unwrap_or_default())), + Err(err) => Err(err.into()), + } + } +} -- 2.47.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel