From 0946f1533ca43dcf8177768fa4facead692f4389 Mon Sep 17 00:00:00 2001 From: Alejandro Huertas Herrero Date: Tue, 29 Sep 2020 10:36:29 +0200 Subject: [PATCH] M #-: do not add home if path is S3 (#259) (cherry picked from commit f13f3365fce49a63a96dd2b143a48c39b8ed347e) --- src/cli/one_helper/oneimage_helper.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/cli/one_helper/oneimage_helper.rb b/src/cli/one_helper/oneimage_helper.rb index 2e9bd14d570..4b8b960cca2 100644 --- a/src/cli/one_helper/oneimage_helper.rb +++ b/src/cli/one_helper/oneimage_helper.rb @@ -20,6 +20,10 @@ # CLI helper for oneimage command class OneImageHelper < OpenNebulaHelper::OneHelper + # This list contains prefixes that should skip adding user home to the path + # This must have the same content as the case $FROM in downloader.sh + PREFIXES = %w[http https ssh s3 rbd vcenter lxd docker] + TEMPLATE_OPTIONS=[ { :name => 'name', @@ -82,7 +86,7 @@ class OneImageHelper < OpenNebulaHelper::OneHelper :description => 'Path of the image file', :format => String, :proc => lambda do |o, _options| - next [0, o] if o.match(%r{^(https?|docker)://}) + next [0, o] if o.match(%r{^(#{PREFIXES.join('|')})://}) if o[0, 1]=='/' path=o