Re: [pve-devel] [PATCH storage 3/9] allow .tar container templates

From: "Michael Köppl" <m.koeppl@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
	Filip Schauer <f.schauer@proxmox.com>
Subject: Re: [pve-devel] [PATCH storage 3/9] allow .tar container templates
Date: Mon, 2 Jun 2025 16:16:57 +0200	[thread overview]
Message-ID: <882dcd98-9fb3-4715-8caf-b79041e2efab@proxmox.com> (raw)
In-Reply-To: <20250520124257.165949-4-f.schauer@proxmox.com>

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 <f.schauer@proxmox.com>
> ---
>  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