Changeset 1900 in ProjectBuilder

Timestamp:

Sep 30, 2014, 10:08:03 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Add support for docker phase 1: newve working
• Add separate pb_ve_snap function
• Add separate pb_ve_docker functions to interact with the registry and the repository
• Add a dockerregistry conf parameter

Location:

devel

Files:

• pb-modules/etc/pb.conf (modified) (2 diffs)
• pb-modules/etc/pb.conf.pod (modified) (2 diffs)
• pb-modules/lib/ProjectBuilder/VE.pm (modified) (11 diffs)
• pb/bin/pb (modified) (13 diffs)
• pbmkbm/bin/pbmkbm (modified) (1 diff)
• rpmbootstrap/bin/rpmbootstrap (modified) (4 diffs)

devel/pb-modules/etc/pb.conf

@@ -402 +402 @@
 rbsmindep mageia-2-x86_64 = basesystem,bash,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,curl,dbus,dhcp-client,dirmngr,e2fsprogs,ethtool,expat,file,filesystem,findutils,gamin,gawk,glibc,gnupg2,grep,info,initscripts,iputils,lib64acl1,lib64attr1,lib64blkid1,lib64bzip2_1,lib64cap2,lib64curl4,lib64db4.8,lib64elfutils1,lib64ext2fs2,lib64gcrypt11,lib64gpg-error0,lib64idn11,lib64krb53,lib64ksba8,lib64ldap2.4_2,lib64lua5.1,lib64lzma5,lib64magic1,lib64ncurses5,lib64ncursesw5,lib64nspr4,lib64nss3,lib64openssl1.0.0,lib64popt0,lib64readline6,lib64rpm2,lib64rpmbuild2,lib64sasl2,lib64sqlite3_0,lib64ssh2_1,lib64termcap2,lib64usb1.0_0,lib64uuid1,lib64xml2_2,lib64zlib1,libgcc1,logrotate,lua,mageia-release-common,meta-task,mingetty,ncurses,net-tools,nss,openldap,openssl,pam,passwd,pcre,perl,perl-base,perl-Config-IniFiles,perl-Locale-gettext,perl-MDV-Distribconf,perl-URPM,procps,psmisc,python,rpm,sed,setup,shadow-utils,systemd,udev,urpmi,util-linux,vim-minimal
 #
-rbsmindep mageia-3-i386 = basesystem,bash,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,curl,dbus,dhcp-client,dirmngr,e2fsprogs,ethtool,expat,file,filesystem,findutils,gamin,gawk,glibc,gnupg2,grep,info,initscripts,iputils,libacl1,libattr1,libblkid1,libbzip2_1,libcap2,libcurl4,libdb5.3,libelfutils1,libext2fs2,libgcc1,libgcrypt11,libgpg-error0,libidn11,libkrb53,libksba8,libldap2.4_2,liblua5.2,liblzma5,libmagic1,libmount1,libncurses5,libncursesw5,libnspr4,libnss3,libopenssl1.0.0,libpopt0,libreadline6,librpm3,librpmbuild3,libsasl2,libsqlite3_0,libssh2_1,libstdc++6,libtermcap2,libudev1,libusb1.0_0,libuuid1,libxml2_2,libzlib1,logrotate,lua,mageia-release-common,meta-task,mingetty,ncurses,net-tools,nss,openldap,openssl,pam,passwd,pcre,perl,perl-base,perl-Config-IniFiles,perl-List-MoreUtils,perl-Locale-gettext,perl-MDV-Distribconf,perl-URPM,procps,psmisc,python,rpm,sed,setup,shadow-utils,systemd,urpmi,util-linux,vim-minimal
-rbsmindep mageia-3-x86_64 = basesystem,bash,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,curl,dbus,dhcp-client,dirmngr,e2fsprogs,ethtool,expat,file,filesystem,findutils,gamin,gawk,glibc,gnupg2,grep,info,initscripts,iputils,lib64acl1,lib64attr1,lib64blkid1,lib64bzip2_1,lib64cap2,lib64curl4,lib64db5.3,lib64elfutils1,lib64ext2fs2,lib64gcrypt11,lib64gpg-error0,lib64idn11,lib64krb53,lib64ksba8,lib64ldap2.4_2,lib64lua5.2,lib64lzma5,lib64magic1,lib64mount1,lib64ncurses5,lib64ncursesw5,lib64nspr4,lib64nss3,lib64openssl1.0.0,lib64popt0,lib64readline6,lib64rpm3,lib64rpmbuild3,lib64sasl2,lib64sqlite3_0,lib64ssh2_1,lib64termcap2,lib64udev1,lib64usb1.0_0,lib64uuid1,lib64xml2_2,lib64zlib1,libgcc1,logrotate,lua,mageia-release-common,meta-task,mingetty,ncurses,net-tools,nss,openldap,openssl,pam,passwd,pcre,perl,perl-base,perl-Config-IniFiles,perl-List-MoreUtils,perl-Locale-gettext,perl-MDV-Distribconf,perl-URPM,procps,psmisc,python,rpm,sed,setup,shadow-utils,systemd,urpmi,util-linux,vim-minimal
+rbsmindep mageia-3-i386 = basesystem,bash,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,curl,dbus,dhcp-client,dirmngr,e2fsprogs,ethtool,expat,file,filesystem,findutils,gamin,gawk,glibc,gnupg2,grep,info,initscripts,iputils,libacl1,libattr1,libblkid1,libbzip2_1,libcap2,libcurl4,libdb5.3,libelfutils1,libext2fs2,libgcc1,libgcrypt11,libgpg-error0,libidn11,libkrb53,libksba8,libldap2.4_2,liblua5.1,liblzma5,libmagic1,libmount1,libncurses5,libncursesw5,libnspr4,libnss3,libopenssl1.0.0,libpopt0,libreadline6,librpm3,librpmbuild3,libsasl2,libsqlite3_0,libssh2_1,libstdc++6,libtermcap2,libudev1,libusb1.0_0,libuuid1,libxml2_2,libzlib1,logrotate,lua,mageia-release-common,meta-task,mingetty,ncurses,net-tools,nss,openldap,openssl,pam,passwd,pcre,perl,perl-base,perl-Config-IniFiles,perl-List-MoreUtils,perl-Locale-gettext,perl-MDV-Distribconf,perl-URPM,procps,psmisc,python,rpm,sed,setup,shadow-utils,systemd,urpmi,util-linux,vim-minimal
+rbsmindep mageia-3-x86_64 = basesystem,bash,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,curl,dbus,dhcp-client,dirmngr,e2fsprogs,ethtool,expat,file,filesystem,findutils,gamin,gawk,glibc,gnupg2,grep,info,initscripts,iputils,lib64acl1,lib64attr1,lib64blkid1,lib64bzip2_1,lib64cap2,lib64curl4,lib64db5.3,lib64elfutils1,lib64ext2fs2,lib64gcrypt11,lib64gpg-error0,lib64idn11,lib64krb53,lib64ksba8,lib64ldap2.4_2,lib64lua5.1,lib64lzma5,lib64magic1,lib64mount1,lib64ncurses5,lib64ncursesw5,lib64nspr4,lib64nss3,lib64openssl1.0.0,lib64popt0,lib64readline6,lib64rpm3,lib64rpmbuild3,lib64sasl2,lib64sqlite3_0,lib64ssh2_1,lib64termcap2,lib64udev1,lib64usb1.0_0,lib64uuid1,lib64xml2_2,lib64zlib1,libgcc1,logrotate,lua,mageia-release-common,meta-task,mingetty,ncurses,net-tools,nss,openldap,openssl,pam,passwd,pcre,perl,perl-base,perl-Config-IniFiles,perl-List-MoreUtils,perl-Locale-gettext,perl-MDV-Distribconf,perl-URPM,procps,psmisc,python,rpm,sed,setup,shadow-utils,systemd,urpmi,util-linux,vim-minimal
 #
 rbsmindep mageia-4-i386 = basesystem,bash,chkconfig,coreutils,cpio,cracklib,cracklib-dicts,crontabs,curl,dbus,dhcp-client,dirmngr,e2fsprogs,ethtool,expat,file,filesystem,findutils,gamin,gawk,glibc,gnupg2,grep,info,initscripts,iputils,libacl1,libattr1,libblkid1,libbzip2_1,libcap2,libcurl4,libdb5.3,libelfutils1,libext2fs2,libgcc1,libgcrypt11,libgpg-error0,libidn11,libkrb53,libksba8,libldap2.4_2,liblua5.1,liblzma5,libmagic1,libmount1,libncurses5,libncursesw5,libnspr4,libnss3,libopenssl1.0.0,libpopt0,libreadline6,librpm3,librpmbuild3,libsasl2_3,libsqlite3_0,libssh2_1,libstdc++6,libudev1,libusb1.0_0,libuuid1,libxml2_2,libzlib1,logrotate,lua,mageia-release-common,meta-task,mingetty,ncurses,net-tools,nss,openldap,openssl,pam,passwd,pcre,perl,perl-base,perl-Config-IniFiles,perl-List-MoreUtils,perl-Locale-gettext,perl-MDV-Distribconf,perl-URPM,procps,psmisc,python,rpm,sed,setup,shadow-utils,systemd,urpmi,util-linux,vim-minimal
@@ -411 +411 @@
 cachedir rpmbootstrap = /var/cache/rpmbootstrap
 cachedir pbmkbm = /var/cache/pbmkbm
+
+# When using docker some specific conf items
+dockerregistry default = http://localhost:5000/pb
+#dockerimage mageia-4-x86_64 = mageia-4-x86_64
+#dockertag pb = pb
 
 # Options to pass to rpmbootstrap command. By default keep downloaded packages

devel/pb-modules/etc/pb.conf.pod

@@ -111 +111 @@
  Example: delivery mondorescue = prod
 
+=item B<dockerregistry>
+
+ Nature: Mandatory
+ Key: project (as defined in the -p option or PBPROJ environment variable)
+ Value: name of the docker registry to interact with
+ Conffile: project
+ Example: dockerregistry mondorescue = localhost:5900/mondorescue
+
 =item B<extpkgdir>
 
@@ -889 +897 @@
  Nature: Mandatory
  Key: project (as defined in the -p option or PBPROJ environment variable)
- Value: chroot|schroot. There are two different ways of launching a chroot activity in pb. For the moment only chroot has been tested.
+ Value: chroot|schroot|docker. There are two different ways of launching a Virtual Environment activity in pb. For the moment only chroot and docker have been tested.
  Conffile: ve
  Example: vertype default = chroot

devel/pb-modules/lib/ProjectBuilder/VE.pm

@@ -31 +31 @@
  
 our @ISA = qw(Exporter);
-our @EXPORT = qw(pb_ve_launch);
+our @EXPORT = qw(pb_ve_launch pb_ve_snap);
 
 ($VERSION,$REVISION) = pb_version_init();
@@ -43 +43 @@
 =head1 DESCRIPTION
 
-This modules provides functions to deal with Virtual Environements (VE), aka chroot.
+This modules provides functions to deal with Virtual Environements (VE), aka chroot/containers.
 
 =head1 SYNOPSIS
@@ -60 +60 @@
 =item B<pb_ve_launch>
 
-This function launch a VE, creating it if necessary using multiple external potential tools.
+This function launches a VE, creating it if necessary using multiple external potential tools.
 
 =cut
@@ -69 +69 @@
 my $pbforce = shift || 0;       # By default do not rebuild VE
 my $locsnap = shift || 0;       # By default do not snap VE
+my $vetype = shift || undef;        # By default no image
+my $pbimage = shift || undef;       # By default no image
+
+my $dockerregistry = undef;
+my $docrepo = undef;            # By default no repository for docker available
 
 # Get distro context
@@ -74 +79 @@
 
 # Get VE context
-my ($ptr,$vepath) = pb_conf_get("vetype","vepath");
-my $vetype = $ptr->{$ENV{'PBPROJ'}};
-
+if (not defined $vetype) {
+    my ($ptr) = pb_conf_get("vetype");
+    $vetype = $ptr->{$ENV{'PBPROJ'}};
+}
 confess "No vetype defined for $ENV{PBPROJ}" unless (defined $vetype);
 pb_log(1, "Using vetype $vetype for $ENV{PBPROJ}\n");
-
-if (($vetype eq "chroot") || ($vetype eq "schroot")) {
+my ($vepath) = pb_conf_get("vepath");
+
+if (($vetype eq "chroot") || ($vetype eq "schroot") || ($vetype eq "docker")) {
 
     # We need to avoid umask propagation to the VE
@@ -87 +94 @@
     # We can probably only get those params now we have the distro context
     my ($rbsb4pi,$rbspi,$vesnap,$oscodename,$osmindep,$verebuild,$rbsmirrorsrv) = pb_conf_get_if("rbsb4pi","rbspi","vesnap","oscodename","osmindep","verebuild","rbsmirrorsrv");
+    if ($vetype eq "docker") {
+        # Check acces to registry
+        ($dockerregistry) = pb_conf_get("dockerregistry");
+        if ((defined $dockerregistry) && (defined $dockerregistry->{$ENV{'PBPROJ'}})) {
+            pb_ve_docker_registry($dockerregistry->{$ENV{'PBPROJ'}});
+        } else {
+            die "When using docker you need to declare a dockerregistry parameter. Read the man page"
+        }
+    }
 
     # Architecture consistency
@@ -98 +114 @@
     if ($EFFECTIVE_USER_ID != 0) {
         $sudocmd ="sudo ";
-        foreach my $proxy (qw/http_proxy ftp_proxy/) {
+    foreach my $proxy (qw/http_proxy ftp_proxy/) {
             if (defined $ENV{$proxy}) {
                 open(CMD,"sudo sh -c 'echo \$$proxy' |") or die "can't run sudo sh?: $!";
@@ -113 +129 @@
 
     my $root = pb_path_expand($vepath->{$ENV{PBPROJ}});
-    if (((defined $verebuild) && ($verebuild->{$ENV{'PBPROJ'}} =~ /true/i)) || ($pbforce == 1)) {
+    
+    if (((((defined $verebuild) && ($verebuild->{$ENV{'PBPROJ'}} =~ /true/i)) || ($pbforce == 1)) && ($vetype ne "docker"))
+        # For docker we may have a reference image that we'll use
+        || (((not defined $pbimage) || ($pbimage eq "")) && ($vetype eq "docker"))) {
+
         my ($verpmtype,$vedebtype) = pb_conf_get("verpmtype","vedebtype");
         my ($rbsopt1) = pb_conf_get_if("rbsopt");
@@ -250 +270 @@
 
     # Test if an existing snapshot exists and use it if appropriate
-    # And also use it of no local extracted VE is present
+    # And also use it if no local extracted VE is present
     if ((-f "$root/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}.tar.gz") &&
     (((defined $vesnap->{$v}) && ($vesnap->{$v} =~ /true/i)) ||
@@ -266 +286 @@
     pb_system("$sudocmd $command 755 $root/$pbos->{'name'} $root/$pbos->{'name'}/$pbos->{'version'} $root/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}","Fixing permissions");
 
+    # If docker, create the image and remove the now temp dir except if we had one already
+    if ($vetype eq "docker") {
+        if ((not defined $pbimage) || ($pbimage eq "")) {
+            # Snaphot the VE to serve as an input for docker
+            pb_ve_snap($pbos,$root);
+            # Create the docker image from the previous bootstrap
+            my $cmd1 = pb_check_req("docker",0);
+            $docrepo = pb_ve_docker_repo($dockerregistry->{$ENV{'PBPROJ'}});
+            pb_system("$cmd1 import - $docrepo:$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'} < $root/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}.tar.gz");
+            pb_system("$cmd1 push $docrepo:$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}");
+        #} else {
+        }
+    }
+
     # Nothing more to do for VE. No real launch
 } else {
@@ -299 +333 @@
 }
 
+# Snapshot the VE
+sub pb_ve_snap {
+
+my $pbos = shift;
+my $root = shift;
+my $tpdir = "$root/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}";
+pb_system("sudo tar cz -C $tpdir -f $root/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}.tar.gz .","Creating a snapshot of $tpdir");
+}
+
+# Returns the docker registry to interact with
+sub pb_ve_docker_registry {
+
+my $dockerreg = shift || undef;
+my $wget = pb_check_req("wget",0);
+my ($scheme, $account, $host, $port, $path) = pb_get_uri($dockerreg);
+my $docreg = $scheme."://";
+$docreg .= $account."@" if ((defined $account) && ($account ne ""));
+$docreg .= $host;
+$docreg .= ":$port" if ((defined $port) && ($port ne ""));
+open(FD,"$wget $docreg -q -O -|") || die "Unable to talk to the docker registry $docreg";
+my $found = undef;
+while (<FD>) {
+    $found = 1 if (/docker-registry/);
+}
+close(FD);
+die "No correct docker-registry answering at $docreg. Please check your configuration" if (not defined $found);
+#
+return($docreg);
+}
+
+# Returns the docker repository to interact with
+sub pb_ve_docker_repo {
+
+my $dockerreg = shift || undef;
+my $docrepo = "";
+my ($scheme, $account, $host, $port, $path) = pb_get_uri($dockerreg);
+$docrepo .= $host;
+$docrepo .= ":$port" if ((defined $port) && ($port ne ""));
+$docrepo .= "$path";
+return($docrepo);
+}
 
 =head1 WEB SITES

devel/pb/bin/pb

@@ -62 +62 @@
 my $pbport;                 # Port to use to connect to the VM/RM
 my $newver;                 # New version to create
-my $iso = undef;            # ISO image for the VM to create
+my $pbimage = undef;            # ISO image for the VM to create or docker image for the VE
+my $vetype = undef;         # Type of Virtual environment to deal with
 
 my @date = pb_get_date();
@@ -85 +86 @@
 =head1 SYNOPSIS
 
-pb [-vhSq][-r pbroot][-p project][[-s script -a account -P port][-t [os-ver-arch]][-m os-ver-arch[,...]]][-g][-i iso] <action> [<pkg1> ...]
-
-pb [--verbose][--help][--man][--quiet][--snapshot][--revision pbroot][--project project][[--script script --account account --port port][--target [os-ver-arch]][--machine os-ver-arch[,...]]][--nographic][--iso iso][--rebuild] <action> [<pkg1> ...]
+pb [-vhSq][-r pbroot][-p project][[-s script -a account -P port][-T VEtype][-t [os-ver-arch]][-m os-ver-arch[,...]]][-g][-i image] <action> [<pkg1> ...]
+
+pb [--verbose][--help][--man][--quiet][--snapshot][--revision pbroot][--project project][[--script script --account account --port port][-T VEtype][--target [os-ver-arch]][--machine os-ver-arch[,...]]][--nographic][--image image][--rebuild] <action> [<pkg1> ...]
 
 =head1 OPTIONS
@@ -124 +125 @@
 All if none precised (or use the env variable PBV).
 
+=item B<-T|--vetype VEtype]>
+
+Type of Virtual Environments (VE)
+Can be chroot or docker.
+
 =item B<-s|--script script>
 
@@ -132 +138 @@
 Do not launch VMs in graphical mode.
 
-=item B<-i|--iso iso_image>
-
-Name of the ISO image of the distribution you want to install on the related VMs.
+=item B<-i|--image image>
+
+It could be either:
+- The name of the ISO image of the distribution you want to install on the related VMs
+- The name of the docker image of the distribution you want to install on the related VEs
+
 
 =item B<-a|--account account>
@@ -670 +679 @@
 
 GetOptions("help|?|h+" => \$opts{'h'}, 
+        "account|a=s" => \$opts{'a'},
+        "force|f" => \$opts{'f'},
+        "nographic|g" => \$opts{'g'},
+        "image|i=s" => \$opts{'i'},
+        "log-files|l=s" => \$opts{'l'},
+        "machines|mock|m=s" => \$opts{'m'},
         "man" => \$opts{'man'},
-        "verbose|v+" => \$opts{'v'},
-        "snapshot|S" => \$opts{'S'},
-        "quiet|q" => \$opts{'q'},
-        "log-files|l=s" => \$opts{'l'},
-        "force|f" => \$opts{'f'},
-        "account|a=s" => \$opts{'a'},
-        "revision|r=s" => \$opts{'r'},
-        "script|s=s" => \$opts{'s'},
-        "machines|mock|m=s" => \$opts{'m'},
-        "target|t:s" => \$opts{'t'},
-        "nographic|g" => \$opts{'g'},
         "port|P=i" => \$opts{'P'},
         "project|p=s" => \$opts{'p'},
+        "quiet|q" => \$opts{'q'},
+        "revision|r=s" => \$opts{'r'},
         "rebuild" => \$opts{'rebuild'},
-        "iso|i=s" => \$opts{'i'},
+        "snapshot|S" => \$opts{'S'},
+        "script|s=s" => \$opts{'s'},
+        "type|T:s" => \$opts{'T'},
+        "target|t:s" => \$opts{'t'},
         "version|V=s" => \$opts{'V'},
+        "verbose|v+" => \$opts{'v'},
         "keep|k" => \$opts{'k'},
         "stop-on-error!" => \$Global::pb_stop_on_error,
@@ -743 +753 @@
 }
 if (defined $opts{'i'}) {
-    $iso = $opts{'i'};
+    $pbimage = $opts{'i'};
 }
 if (defined $opts{'t'}) {
     $pbtarget = $opts{'t'};
+}
+if (defined $opts{'T'}) {
+    $vetype = $opts{'T'};
 }
 
@@ -2353 +2366 @@
     my ($shcmd,$shcmdroot,$cpcmd,$cptarget,$cp2target);
     my $tpdir;
+    my $tp;
     if ($cmt =~ /^VE/) {
-        my $tp = pb_path_expand($vepath->{$ENV{'PBPROJ'}});
+        $tp = pb_path_expand($vepath->{$ENV{'PBPROJ'}});
         $tpdir = pb_path_expand("$tp/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}");
-        my ($ptr) = pb_conf_get("vetype");
-        my $vetype = $ptr->{$ENV{'PBPROJ'}};
+        if (not defined $vetype) {
+            my ($ptr) = pb_conf_get("vetype");
+            $vetype = $ptr->{$ENV{'PBPROJ'}};
+        }
         my $arch = pb_get_arch();
         if ($vetype eq "chroot") {
@@ -2364 +2380 @@
         } elsif ($vetype eq "schroot") {
             $shcmd = "schroot $tp -u $mac -- ";
+        } elsif ($vetype eq "docker") {
+            # docker manages the storage so rely on it
+            $shcmdroot = "sudo /usr/bin/docker $tpdir ";
+            $shcmd = "$shcmdroot /bin/su - $mac -c ";
         }
         $shcmd = "setarch i386 $shcmd" if (($pbos->{'arch'} =~ /i[3456]86/) && ($arch eq 'x86_64'));
@@ -2533 +2553 @@
     }
     if (($cmt =~ /^VE/) && ($snapme != 0)) {
-        my $tpdir = "$vepath->{$ENV{'PBPROJ'}}/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}";
-        pb_system("sudo tar cz -C $tpdir -f $vepath->{$ENV{'PBPROJ'}}/$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}.tar.gz .","Creating a snapshot of $tpdir");
+        pb_ve_snap($pbos,$tp);
     }
 }
@@ -2617 +2636 @@
     # Launch the VMs/VEs
     if ($vtype eq "vm") {
-        die "-i iso parameter needed" if (((not defined $iso) || ($iso eq "")) && ($create != 0));
+        die "-i image parameter needed" if (((not defined $pbimage) || ($pbimage eq "")) && ($create != 0));
 
         my ($ptr,$ptr2,$vmpath,$vmport,$vms) = pb_conf_get("vmtype","vmcmd","vmpath","vmport","vmsize");
@@ -2683 +2702 @@
         if (($vmtype eq "qemu") || ($vmtype eq "kvm")) {
             $vmm = "$vmpath->{$ENV{'PBPROJ'}}/$v.qemu";
-            if (($create != 0) || (defined $iso)) {
-                $ENV{'PBVMOPT'} .= " -cdrom $iso -boot d";
+            if (($create != 0) || (defined $pbimage)) {
+                $ENV{'PBVMOPT'} .= " -cdrom $pbimage -boot d";
             }
             # Always redirect the network and always try to use a 'pb' snapshot
@@ -2746 +2765 @@
     } elsif ($vtype eq "ve") {
         # Force the creation of the VE and no snapshot usable
-        pb_ve_launch($v,$create,$usesnap);
+        pb_ve_launch($v,$create,$usesnap,$vetype,$pbimage);
     } else {
         # RM here
@@ -3504 +3523 @@
             # And shouldn't we be getting the one that matches the current pb version?
             # For the moment, just take the latest stable one
-            $cmdget = "wget --passive-ftp ftp://ftp.project-builder.org/src/ProjectBuilder-latest.tar.gz; wget --passive-ftp ftp://ftp.project-builder.org/src/project-builder-latest.tar.gz";
+            my $wget = pb_check_req("wget",0);
+            $cmdget = "$wget --passive-ftp ftp://ftp.project-builder.org/src/ProjectBuilder-latest.tar.gz; $wget --passive-ftp ftp://ftp.project-builder.org/src/project-builder-latest.tar.gz";
         }
         print SCRIPT << 'EOF';

devel/pbmkbm/bin/pbmkbm

@@ -404 +404 @@
 if ($opts{'b'} eq "ve") {
     # Use project-builder VE mecanism to create a good VE !
+    # TODO: This call is now assuming default vetype and image
     pb_ve_launch($ENV{'PBV'},1);
 } elsif ($opts{'b'} eq "native") {

devel/rpmbootstrap/bin/rpmbootstrap

@@ -64 +64 @@
 =head1 SYNOPSIS
 
-rpmbootstrap [-vhmqpdk][-s script][-i iso][-a pkg1[,pkg2,...]] distribution-version-arch [target-dir] [mirror [script]]
+rpmbootstrap [-vhmqpdk][-s script][-i image][-a pkg1[,pkg2,...]] distribution-version-arch [target-dir] [mirror [script]]
 
 rpmbootstrap [--verbose][--help][--man][--quiet][--print-rpms][--download-only]
-[--keep][--script script][--iso iso][--add pkg1,[pkg2,...]] distribution-version-arch [target-dir] [mirror [script]]
+[--keep][--script script][--image image][--add pkg1,[pkg2,...]] distribution-version-arch [target-dir] [mirror [script]]
 
 =head1 OPTIONS
@@ -110 +110 @@
 You can use the chroot command to execute actions in the VE.
 
-=item B<-i|--iso iso_image>
-
-Name of the ISO image of the distribution you want to install on the related VE.
+=item B<-i|--image image>
+
+Name of the ISO image or the docker image of the distribution you want to install on the related VE.
 
 =item B<-a|--add pkg1[,pkg2,...]>
@@ -194 +194 @@
     "download-only|d" => \$opts{'d'},
     "keep|k" => \$opts{'k'},
-    "iso|i=s" => \$opts{'i'},
+    "image|i=s" => \$opts{'i'},
     "add|a=s" => \$opts{'a'},
     "version|V=s" => \$opts{'V'},
@@ -224 +224 @@
 #}
 #if (defined $opts{'i'}) {
-#$iso = $opts{'i'};
+#$image = $opts{'i'};
 #}