mirror of
https://github.com/OpenNebula/one.git
synced 2025-03-27 10:50:10 +03:00
(cherry picked from commit bb3b0f73199905cdc2780b60752a30c8c611ce8c)
This commit is contained in:
parent
c26b6d4705
commit
e135976319
@ -37,7 +37,9 @@ class LinuxContainersMarket
|
||||
:sizemb => 1024,
|
||||
:fs => 'ext4',
|
||||
:format => 'raw',
|
||||
:agent => 'OpenNebula'
|
||||
:agent => 'OpenNebula',
|
||||
:tested_apps => %w[alpine centos debian ubuntu fedora devuan],
|
||||
:skip_untested => 'yes'
|
||||
}
|
||||
|
||||
TEMPLATE = "
|
||||
@ -101,10 +103,17 @@ CONTEXT = [
|
||||
return rc, body if rc != 0
|
||||
|
||||
distros = body.scan(%r{a href="([a-z].*/)">})
|
||||
tree = {}
|
||||
distros.map! {|d| d.join.chomp('/') }
|
||||
|
||||
if @options[:skip_untested] == 'yes'
|
||||
distros.delete_if {|d| !@options[:tested_apps].include?(d) }
|
||||
end
|
||||
|
||||
tree = {}
|
||||
|
||||
distros.each do |distro|
|
||||
rc, body = get(first_level + distro[0])
|
||||
d_suf = "#{distro}/"
|
||||
rc, body = get(first_level + d_suf)
|
||||
|
||||
next if rc != 0
|
||||
|
||||
@ -113,7 +122,7 @@ CONTEXT = [
|
||||
|
||||
version_path = {}
|
||||
versions.each do |version|
|
||||
path = "#{first_level}#{distro[0]}#{version[0]}amd64/default/"
|
||||
path = "#{first_level}#{d_suf}#{version[0]}amd64/default/"
|
||||
rc, body = get(path)
|
||||
|
||||
next if rc != 0
|
||||
@ -125,7 +134,7 @@ CONTEXT = [
|
||||
version_path[version[0]] = "#{path}#{release_date}rootfs.tar.xz"
|
||||
end
|
||||
|
||||
tree[distro[0]] = version_path
|
||||
tree[d_suf] = version_path
|
||||
end
|
||||
|
||||
appstr = ''
|
||||
@ -255,7 +264,8 @@ begin
|
||||
pre = 'MARKETPLACE/TEMPLATE'
|
||||
|
||||
data = { :url => "#{pre}/ENDPOINT", :sizemb => "#{pre}/IMAGE_SIZE_MB",
|
||||
:fs => "#{pre}/FILESYSTEM", :format => "#{pre}/FORMAT" }
|
||||
:fs => "#{pre}/FILESYSTEM", :format => "#{pre}/FORMAT",
|
||||
:skip_untested => "#{pre}/SKIP_UNTESTED" }
|
||||
|
||||
data.each {|key, value| set_option(options, doc, key, value) }
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user