From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 405B31FF191 for ; Mon, 2 Jun 2025 16:17:12 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 43128359AA; Mon, 2 Jun 2025 16:17:30 +0200 (CEST) Message-ID: <882dcd98-9fb3-4715-8caf-b79041e2efab@proxmox.com> Date: Mon, 2 Jun 2025 16:16:57 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: Proxmox VE development discussion , Filip Schauer References: <20250520124257.165949-1-f.schauer@proxmox.com> <20250520124257.165949-4-f.schauer@proxmox.com> From: =?UTF-8?Q?Michael_K=C3=B6ppl?= Content-Language: en-US In-Reply-To: <20250520124257.165949-4-f.schauer@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.004 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pve-devel] [PATCH storage 3/9] allow .tar container templates 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" On 5/20/25 14:42, Filip Schauer wrote: > This is needed for OCI container images bundled as tar files, as > generated by `docker save`. OCI images do not need additional > compression, since the content is usually compressed already. > > Signed-off-by: Filip Schauer > --- > src/PVE/Storage.pm | 2 +- > src/PVE/Storage/Plugin.pm | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/src/PVE/Storage.pm b/src/PVE/Storage.pm > index d0a696a..6b03e32 100755 > --- a/src/PVE/Storage.pm > +++ b/src/PVE/Storage.pm > @@ -110,7 +110,7 @@ PVE::Storage::Plugin->init(); > > our $ISO_EXT_RE_0 = qr/\.(?:iso|img)/i; > > -our $VZTMPL_EXT_RE_1 = qr/\.tar\.(gz|xz|zst|bz2)/i; > +our $VZTMPL_EXT_RE_1 = qr/\.tar(?:\.(gz|xz|zst|bz2))?/i; I think this also needs an update in the UploadToStorage window in pve-manager. During my testing I was unable to upload a .tar file and .tar was also not shown as a supported file type in my file selection dialog. Adding .tar as an accepted extension for the upload dialog made it work. > > our $BACKUP_EXT_RE_2 = qr/\.(tgz|(?:tar|vma)(?:\.(${\PVE::Storage::Plugin::COMPRESSOR_RE}))?)/; > > diff --git a/src/PVE/Storage/Plugin.pm b/src/PVE/Storage/Plugin.pm > index 4e16420..db24f4a 100644 > --- a/src/PVE/Storage/Plugin.pm > +++ b/src/PVE/Storage/Plugin.pm > @@ -1380,7 +1380,7 @@ my $get_subdir_files = sub { > } elsif ($tt eq 'vztmpl') { > next if $fn !~ m!/([^/]+$PVE::Storage::VZTMPL_EXT_RE_1)$!; > > - $info = { volid => "$sid:vztmpl/$1", format => "t$2" }; > + $info = { volid => "$sid:vztmpl/$1", format => $2 ? "t$2" : "tar" }; > > } elsif ($tt eq 'backup') { > next if $fn !~ m!/([^/]+$PVE::Storage::BACKUP_EXT_RE_2)$!; _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel