Changeset 2150 in ProjectBuilder for devel/pb

Timestamp:

Dec 22, 2016, 6:50:45 PM (7 years ago)

Author:

Bruno Cornec

Message:

The cidfile should be different for each container to avoid conflicts when launching multiple containers at the same time

File:

• devel/pb/bin/pb (modified) (3 diffs)

devel/pb/bin/pb

@@ -2458 +2458 @@
     my $dkaccount = "";
     my $cmd1 = "";
+    my $cidfile = "$context/ctn-$pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}.cid";
     my $homedir = "";
     if ($cmt =~ /^VE/) {
@@ -2518 +2519 @@
             } else {
                 # As we are in run phase use docker run. cmd will be completed below
-                $shcmd = "$cmd1 run --cidfile=\"$ENV{'PBTMP'}/ctn.cid\" --user $dkaccount --name $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}-$cmt";
+                $shcmd = "$cmd1 run --cidfile=\"$cidfile\" --user $dkaccount --name $pbos->{'name'}-$pbos->{'version'}-$pbos->{'arch'}-$cmt";
             }
             #$shcmd = "$cmd1 build $dockeropt->{$ENV{'PBPROJ'}} -t $tag{$pbstep+1} $context";
@@ -2537 +2538 @@
             if ($pbstep >= 2) {
                 # We need to get the home dir of the target account to deliver in the right place
-                $homedir = `$cmd1 run --cidfile="$ENV{'PBTMP'}/ctn.cid" $tag{$pbstep} grep -E '^$dkaccount:' /etc/passwd | cut -d: -f6`;
+                $homedir = `$cmd1 run --cidfile="$cidfile" $tag{$pbstep} grep -E '^$dkaccount:' /etc/passwd | cut -d: -f6`;
                 chomp($homedir);
-                open(CID,"$ENV{'PBTMP'}/ctn.cid") || confess "Unable to open $ENV{'PBTMP'}/ctn.cid";
+                open(CID,"$cidfile") || confess "Unable to open $cidfile";
                 my $cid = <CID>;
                 close(CID);
                 pb_system("$cmd1 rm $cid","","quiet");
-                unlink("$ENV{'PBTMP'}/ctn.cid");
+                unlink("$cidfile");
             } else {
                 $homedir = "/";