Commit bb9466e6 authored by David Johnson's avatar David Johnson

Handle symlinks in docker clientside dockerfiles fs processing.

parent 34aa0d23
......@@ -4694,8 +4694,19 @@ sub emulabizeImage($;$$$$$$$$)
#
my @copydirs = ();
foreach my $td ('common',$dist,$tag,$mintag) {
push(@copydirs,$td)
if (-d "$DOCKERFILES/$td");
if (-l "$DOCKERFILES/$td") {
push(@copydirs,$td);
my $linktarget = readlink("$DOCKERFILES/$td");
if ($linktarget =~ /^\//) {
push(@copydirs,"$linktarget");
}
else {
push(@copydirs,"$linktarget");
}
}
elsif (-d "$DOCKERFILES/$td") {
push(@copydirs,$td);
}
}
my @dfiles = ();
my @runscripts = ();
......
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