Changeset 1967 in ProjectBuilder

Timestamp:

Jun 12, 2015, 11:44:03 PM (9 years ago)

Author:

Bruno Cornec

Message:

• newve now installs deps in container if using an upstream one

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/VE.pm (modified) (3 diffs)
• pb/bin/pb (modified) (1 diff)

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

@@ -93 +93 @@
 }
 
+# Architecture consistency
+my $arch = pb_get_arch();
+if ($arch ne $pbos->{'arch'}) {
+    die "Unable to launch a VE of architecture $pbos->{'arch'} on a $arch platform" unless (($pbos->{'arch'} =~ /i?86/o) && ($arch eq "x86_64"));
+}
+
+# If we are already root (from pbmkbm e.g.) don't use sudo, just call the command
+my $sudocmd="";
+if ($EFFECTIVE_USER_ID != 0) {
+    $sudocmd ="sudo ";
+    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?: $!";
+            $_ = <CMD>;
+            chomp();
+            die "sudo not passing through env var $proxy; '$ENV{$proxy}' != '$_'\nAdd line Defaults:`whoami` env_keep += \"$proxy\" to sudoers file?" unless $_ eq $ENV{$proxy};
+            close(CMD);
+        }
+    }
+}
+
+# Handle cross arch on Intel based platforms
+$sudocmd = "setarch i386 $sudocmd" if (($pbos->{'arch'} =~ /i[3456]86/) && ($arch eq 'x86_64'));
+
+my $root = pb_path_expand($vepath->{$ENV{PBPROJ}});
+    
 if (($vetype eq "chroot") || ($vetype eq "schroot") || ($vetype eq "docker")) {
 
@@ -101 +127 @@
     my ($rbsb4pi,$rbspi,$vesnap,$oscodename,$osmindep,$verebuild,$rbsmirrorsrv) = pb_conf_get_if("rbsb4pi","rbspi","vesnap","oscodename","osmindep","verebuild","rbsmirrorsrv");
 
-    # Architecture consistency
-    my $arch = pb_get_arch();
-    if ($arch ne $pbos->{'arch'}) {
-        die "Unable to launch a VE of architecture $pbos->{'arch'} on a $arch platform" unless (($pbos->{'arch'} =~ /i?86/o) && ($arch eq "x86_64"));
-    }
-
-    # If we are already root (from pbmkbm e.g.) don't use sudo, just call the command
-    my $sudocmd="";
-    if ($EFFECTIVE_USER_ID != 0) {
-        $sudocmd ="sudo ";
-        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?: $!";
-                $_ = <CMD>;
-                chomp();
-                die "sudo not passing through env var $proxy; '$ENV{$proxy}' != '$_'\nAdd line Defaults:`whoami` env_keep += \"$proxy\" to sudoers file?" unless $_ eq $ENV{$proxy};
-                close(CMD);
-            }
-        }
-    }
-
-    # Handle cross arch on Intel based platforms
-    $sudocmd = "setarch i386 $sudocmd" if (($pbos->{'arch'} =~ /i[3456]86/) && ($arch eq 'x86_64'));
-
-    my $root = pb_path_expand($vepath->{$ENV{PBPROJ}});
-    
     if (((((defined $verebuild) && ($verebuild->{$ENV{'PBPROJ'}} =~ /true/i)) || ($pbforce == 0)) && ($vetype ne "docker"))
         # For docker we may have a reference image that we'll use
@@ -304 +304 @@
         } else {
             # If we pass a parameter to -i, this is the name of an existing upstream image for that distro-ver-arch
-            pb_system("$sudocmd $cmd1 tag $pbimage $docrepo:$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}");
+            # That container should then be setup correctly which may not be the case yet
+            #
+            # We can probably only get those params now we have the distro context
+            my ($osmindep) = pb_conf_get_if("osmindep");
+            my $pkgs = pb_distro_get_param($pbos,$osmindep);
+            $pkgs =~ s/,/ /g;
+            my $tmpd = "$ENV{'PBTMP'}/Dockerfile";
+            open(DOCKER, "> $tmpd") || die "Unable to create the docker file $tmpd";
+            print DOCKER "FROM $pbimage\n";
+            print DOCKER "MAINTAINER project-builder.org aka pb\n";
+            print DIOCKER "ENV ftp_proxy $ENV{ftp_proxy}\n" if (defined $ENV{ftp_proxy});
+            print DIOCKER "ENV http_proxy $ENV{http_proxy}\n" if (defined $ENV{http_proxy});
+            # We are root in that container so no need to sudo, which is present potentially
+            my $cmd2 = $pbos->{'install'};
+            $cmd2 =~ s/sudo //g;
+            print DOCKER "RUN $cmd2 $pkgs\n";
+            close(DOCKER);
+            pb_system("cd $ENV{'PBTMP'} ; $sudocmd $cmd1 build -t $docrepo:$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'} .","Installing dependencies $pkgs in Docker container $docrepo:$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}");
+            unlink($tmpd);
         }
     }

devel/pb/bin/pb

@@ -2641 +2641 @@
             print DOCKER "COPY $s $cptarget/\n";
             # call directly with perl to avoid text file busy error messages
-            print DOCKER "RUN cd $cptarget ; perl ./$s ; if [ '$pbkeep' == '0' ]; then rm -f $s; fi\n";
+            print DOCKER "RUN cd $cptarget ; perl ./$s ; if [ '$pbkeep' = '0' ]; then rm -f $s; fi\n";
             print DOCKER "RUN rm -rf $cptarget/*\n";
             print DOCKER "RUN chown -R pb $cptarget\n" if ($pbstep == 1);