Commit 5b4e102b authored by Elijah Grubb's avatar Elijah Grubb

Merge remote-tracking branch 'origin/master' into entrypoint-bug-fix

parents ef1f1102 34aa0d23
......@@ -282,7 +282,6 @@ sub container_run($$$$;$$$) {
}
$args->{'Image'} = $image;
$args->{'Cmd'} = $cmd;
$args->{'Tty'} = JSON::PP::false;
my ($code,$content,$resp);
($code,$content) = $self->container_create($id,$args);
if ($code) {
......
......@@ -4334,7 +4334,9 @@ sub analyzeImage($$)
my $args = {
'HostConfig' => {
'Binds' => [ "/etc/emulab/docker/container-utils:/tmp/docker:ro" ]
}
},
'Entrypoint' => '',
'User' => 'root',
};
my $tmpname = "analyzer-".int(rand(POSIX::INT_MAX));
our $buf = '';
......@@ -4930,6 +4932,8 @@ sub emulabizeImage($;$$$$$$$$)
];
$args{'Image'} = $image;
$args{'Cmd'} = ["/bin/sh","-c","cd \$CONTEXT && $ascript"];
$args{'Entrypoint'} = '';
$args{'User'} = 'root';
my $tmpname = "artifact-".sha1_hex($image . rand(POSIX::INT_MAX));
TBDebugTimeStamp("creating artifact container $tmpname for".
" artifact script $ascript...");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment