Commit bc6429b3 authored by David Johnson's avatar David Johnson

Merge branch 'master' into 'master'

Fixing errors in emulabizing Docker images

See merge request !36
parents ccd50cbe b6e0952e
...@@ -30,6 +30,10 @@ ...@@ -30,6 +30,10 @@
# suit our purposes, but not any other kind of sshd). # suit our purposes, but not any other kind of sshd).
# #
# Docker attach is sometimes racy so give it observer a chance to attach
# before printing output
sleep 4
# #
# Find the distro, release number, etc. # Find the distro, release number, etc.
# #
......
{ {
"Cmd": [ "/sbin/init-runit.sh" ] "Entrypoint": [ "/sbin/init-runit.sh" ],
"Cmd": []
} }
{ {
"Cmd": [ "/sbin/init-runit.sh" ] "Entrypoint": [ "/sbin/init-runit.sh" ],
"Cmd": []
} }
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
/etc/init.d/rcS # /etc/init.d/rcS
/etc/init.d/rmnologin # /etc/init.d/rmnologin
touch /etc/runit/stopit touch /etc/runit/stopit
chmod 0 /etc/runit/stopit chmod 0 /etc/runit/stopit
{ {
"Cmd": [ "/sbin/init-runit.sh" ] "Entrypoint": [ "/sbin/init-runit.sh" ],
"Cmd": []
} }
{ {
"Cmd": [ "/sbin/init-runit.sh" ] "Entrypoint": [ "/sbin/init-runit.sh" ],
"Cmd": []
} }
{ {
"Cmd": [ "/sbin/init-runit.sh" ] "Entrypoint": [ "/sbin/init-runit.sh" ],
"Cmd": []
} }
{ {
"Cmd": [ "/sbin/init-runit.sh" ] "Entrypoint": [ "/sbin/init-runit.sh" ],
"Cmd": []
} }
...@@ -4834,7 +4834,15 @@ sub emulabizeImage($;$$$$$$$$) ...@@ -4834,7 +4834,15 @@ sub emulabizeImage($;$$$$$$$$)
$dockerenvironmentvars = $iattrs{DOCKER_ENV}; $dockerenvironmentvars = $iattrs{DOCKER_ENV};
foreach my $elem (@$dockerenvironmentvars) { foreach my $elem (@$dockerenvironmentvars) {
print $runitfile "export "; print $runitfile "export ";
print $runitfile $elem; my $elemname;
my $elemvalue;
$elemname = substr($elem, 0, index($elem, '='));
$elemvalue = substr($elem, index($elem, '=') + 1);
print $runitfile $elemname;
print $runitfile "=";
print $runitfile "\"";
print $runitfile $elemvalue;
print $runitfile "\"";
print $runitfile "\n"; print $runitfile "\n";
} }
} }
......
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