Changeset 1900 in ProjectBuilder for devel/pb-modules/lib/ProjectBuilder/VE.pm

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

File:

• devel/pb-modules/lib/ProjectBuilder/VE.pm (modified) (11 diffs)

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