playground: Fix Dockerfile.
Also more cleanup in client.
Change-Id: Ia3fb287d0f0115369752796b55dcd521334d4210
diff --git a/client/browser/widgets/ace-widget.js b/client/browser/widgets/ace-widget.js
index 5a3ed98..fcc5b44 100644
--- a/client/browser/widgets/ace-widget.js
+++ b/client/browser/widgets/ace-widget.js
@@ -83,9 +83,6 @@
case 'json':
session.setMode('ace/mode/javascript');
break;
- case 'js':
- session.setMode('ace/mode/javascript');
- break;
default:
throw new Error('Language type not supported: ' + editor.extname);
}
diff --git a/client/public/go/index.html b/client/public/go/index.html
deleted file mode 100644
index c19be4b..0000000
--- a/client/public/go/index.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
- <title>Playground</title>
- <link rel="stylesheet" href="/bundle.css">
- <script src="/bundle.js" async></script>
- </head>
- <body>
- <main>
- <h1>Hello, go playground!</h1>
- <div class="lang-go playground" data-src="/fortune/bundle_go.json"></div>
- </main>
- </body>
-</html>
diff --git a/go/src/v.io/x/playground/Dockerfile b/go/src/v.io/x/playground/Dockerfile
index 7ae6680..9f9aab0 100644
--- a/go/src/v.io/x/playground/Dockerfile
+++ b/go/src/v.io/x/playground/Dockerfile
@@ -3,7 +3,7 @@
# Install various prereqs.
RUN apt-get update && \
- apt-get install -y curl git && \
+ apt-get install -y curl git make && \
apt-get clean
# Install Go. Note, the apt-get "golang" target is too old.
@@ -17,24 +17,16 @@
ENV JIRI_ROOT /usr/local/vanadium
ENV GOPATH $JIRI_ROOT/release/projects/playground/go
ENV VDLPATH $JIRI_ROOT/release/projects/playground/go/src
-ENV PATH $JIRI_ROOT/release/projects/playground/go/bin:$JIRI_ROOT/release/go/bin:$JIRI_ROOT/devtools/bin:$PATH
+ENV PATH $JIRI_ROOT/release/projects/playground/go/bin:$JIRI_ROOT/.jiri_root/bin:$JIRI_ROOT/release/go/bin:$PATH
# Setup Vanadium.
# Note: This will be cached! If you want to re-build the docker image using
# fresh Vanadium code, you must pass "--no-cache" to the docker build command.
# See README.md.
-RUN curl https://v.io/bootstrap | bash
+RUN curl -f https://vanadium.github.io/bootstrap.sh | bash
# Setup Vanadium profiles.
-RUN jiri profile install v23:base
-
-# Install the release/javascript/core library.
-# TODO(nlacasse): Switch to "npm install -g vanadium" once release/javascript/core
-# is publicly visible in NPM.
-# NOTE(sadovsky): NPM is flaky. If any of the NPM commands below fail, simply
-# retry them.
-WORKDIR /home/playground
-RUN npm install --production $JIRI_ROOT/release/javascript/core
+RUN jiri profile-v23 install v23:base
# Install Vanadium libraries and playground binaries.
RUN jiri go install -v v.io/...
