More updates to get playground running with the latest codebase.
Change-Id: I5a1807874aa4d6dbb962b7672a9ca81b4fb5015d
diff --git a/tools/playground/builder/Dockerfile b/tools/playground/builder/Dockerfile
index afb33d3..e1ffcb8 100644
--- a/tools/playground/builder/Dockerfile
+++ b/tools/playground/builder/Dockerfile
@@ -5,12 +5,13 @@
ENV VEYRON_ROOT /usr/local/veyron
ADD netrc /root/.netrc
RUN curl -u veyron:D6HT]P,LrJ7e https://www.envyor.com/noproxy/veyron-setup.sh | bash
-RUN /veyron/bin/veyron setup proximity
+RUN /usr/local/veyron/bin/veyron setup proximity
RUN rm /root/.netrc
WORKDIR /usr/local/veyron/veyron
ENV PATH /usr/local/veyron/veyron/go/bin:/usr/local/veyron/veyron/scripts/build:/usr/local/bin:/usr/bin:/bin
-RUN go install veyron2/vdl/vdl veyron/tools/playground/builder
+RUN go install veyron/tools/identity veyron/services/mounttable/mounttabled veyron2/vdl/vdl
+RUN go install veyron/tools/playground/builder veyron/tools/playground/compilerd
RUN adduser --quiet --disabled-password playground
diff --git a/tools/playground/builder/vbuild.go b/tools/playground/builder/vbuild.go
index 74548f7..9a3b9b9 100644
--- a/tools/playground/builder/vbuild.go
+++ b/tools/playground/builder/vbuild.go
@@ -266,7 +266,7 @@
return err
}
buf := bufio.NewReader(reader)
- pat := regexp.MustCompile("Mount table at: (.+)\n")
+ pat := regexp.MustCompile("Mount table .+ endpoint: (.+)\n")
timeout := time.After(RUN_TIMEOUT)
ch := make(chan string)
@@ -274,6 +274,8 @@
for line, err := buf.ReadString('\n'); err == nil; line, err = buf.ReadString('\n') {
if groups := pat.FindStringSubmatch(line); groups != nil {
ch <- groups[1]
+ } else {
+ Log(line)
}
}
close(ch)
