Commit 7b8f84c0 authored by David Johnson's avatar David Johnson

Minor docker bug: handle path-style image emulabization.

parent 799aead8
...@@ -4335,6 +4335,7 @@ sub emulabizeImage($;$$$$$$$$) ...@@ -4335,6 +4335,7 @@ sub emulabizeImage($;$$$$$$$$)
$newimage = $image; $newimage = $image;
$newimage =~ tr/:/-/; $newimage =~ tr/:/-/;
$newimagecdirname = $newimage; $newimagecdirname = $newimage;
$newimagecdirname =~ tr/\//---/;
$newimage .= ":emulab-$newzation"; $newimage .= ":emulab-$newzation";
$newimagecdirname .= "--emulab-$newzation"; $newimagecdirname .= "--emulab-$newzation";
} }
...@@ -4342,6 +4343,7 @@ sub emulabizeImage($;$$$$$$$$) ...@@ -4342,6 +4343,7 @@ sub emulabizeImage($;$$$$$$$$)
$newimage = $$newimageref; $newimage = $$newimageref;
$newimagecdirname = "$newimage--emulab-$newzation"; $newimagecdirname = "$newimage--emulab-$newzation";
$newimagecdirname =~ tr/:/-/; $newimagecdirname =~ tr/:/-/;
$newimagecdirname =~ tr/\//---/;
} }
# #
......
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