Merge 3454f8eefb into a24c55b76d

.gitignore

@@ -13,4 +13,6 @@ logs
 results
 
 npm-debug.log
-node_modules/*
+node_modules/*
+
+.idea/

Dockerfile

@@ -1,15 +1,15 @@
-FROM node:0.10.38
+FROM node:6.11.5
 MAINTAINER Nathan LeClaire <nathan@docker.com>
 
 ADD . /app
 WORKDIR /app
+RUN chmod 400 spark.pem
 RUN npm install
+RUN npm rebuild
 RUN apt-get update
 RUN apt-get install -y vim
-RUN useradd -d /home/term -m -s /bin/bash term
-RUN echo 'term:term' | chpasswd
 
 EXPOSE 3000
 
 ENTRYPOINT ["node"]
-CMD ["app.js", "-p", "3000"]
+CMD ["app.js", "-p", "3000", "--sshhost", "172.31.1.109", "--sshuser", "hadoop", "--sslkey", "spark.pem", "--sshauth", "publickey", "--sshport", "22"]

README.md

@@ -89,7 +89,7 @@ whatever you want!
 Just do:
 
 ```
-    docker run --name term -p 3000 -dt krishnasrinivas/wetty
+    docker run --name term -p 3000:3000 -dt krishnasrinivas/wetty
 ```
 
 Visit the appropriate URL in your browser (`[localhost|$(boot2docker ip)]:PORT`).  

app.js

@@ -102,14 +102,14 @@ io.on('connection', function(socket){
     }
 
     var term;
-    if (process.getuid() == 0) {
+    if (false && process.getuid() == 0) {
         term = pty.spawn('/usr/bin/env', ['login'], {
             name: 'xterm-256color',
             cols: 80,
             rows: 30
         });
     } else {
-        term = pty.spawn('ssh', [sshuser + sshhost, '-p', sshport, '-o', 'PreferredAuthentications=' + sshauth], {
+        term = pty.spawn('ssh', ['-i', opts.sslkey, sshuser + sshhost, '-p', sshport, '-o', 'PreferredAuthentications=' + sshauth], {
             name: 'xterm-256color',
             cols: 80,
             rows: 30

package.json

@@ -4,7 +4,7 @@
     "dependencies": {
         "express": "3.5.1",
         "socket.io": "^1.3.7",
-        "pty.js": "^0.3.0",
+        "pty.js": "^0.3.1",
         "optimist": "^0.6"
     },
     "devDependencies": {

spark.pem

@@ -0,0 +1,23 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAj9j+mKlqxGtolm0nnj0d5csSMfBWhRoKKfei0ExBE/nqv/J/TNy7J3Fod/cN
+zzZLf08hLOXZkVcUZTUESFohXAPYoYrV5ta4ILY4A+sPxlxZ7AEsEJ0n2sMhMnh4JSSrC8RFtrJO
+h5uxgy0XshTE892xtkylkzoYtl8eAsjKklxPCwwkoUr6CmaiYo+GilzEYpFOP8jiYFiyQ4/LqDD4
+VoIjZSKL1ZdjGivAT83MpR1ErQaR7lGPMHZSlPW2pAJcbkEeFlf2JRb13AAkwacfDRraRNrJdPwO
+1vRMiLH9rN79zbdAjmZy4QGcWLG9f1n96ofeAevyYHscBJ2DoZqXwwIDAQABAoIBAHwjumQpIRjt
+0M6w2NX4zIp5m/Q5A5HOjSL2sS2uASOqNGr+bdn5TBKYDp4pOWOv6auusGS83+xMCC/ndxCxp8Rv
+FU8kL8ENYM3qM6E+BNkc7gV8ZXjZB4IFj+qsiJMVd/+pnLg0XQ0u0hzwl1h6EBadJja7ItFR++23
+XIDuo9N2Q46584KbJZ+NUEJx1QorhQYXoWY53cffqUIzp7Sy48N0YDCWXNPSGHjKd/VNbE3yluWl
+WrZmd0IHfjkj+zJHNMMdnm63/nUxnAy41RHSroIaJllFycROUAu19MpW8k99rb5t0+kCqJYjPAJc
+qwwPrR/ytf6GRajdgOJm27hSoQECgYEA3e5RCpf2u7F64RW1By64F7bqyJtYLz/VL7jjJDg/1ugm
+dkzOL1geOFkaO+NwEyJ4S63Mqj+QNEV3n7U+VqbNQJ7FHnr0B/Kbbe1WXTm01sXUuqVeMjBxjDkV
+h9+7wxGc3wiF+Yt3SYHbSCrbkuP8Vs4UhyFXsGdMM3a8v1Pf+cECgYEApe4TYdJLhllXl1VMmXdA
+Vqm6dVIw7stSW6JOiLYBuycTrpfqRqCMVITkJFk4+P/bT9jZ0Yp8KtGnNCSWhXdFiNSEE1J4I8Pz
+B4l3+QA2SMzHjBqC+jQqGQ23OVRLJiCc6/mw1jh8tfJdYuspJU7LkuOjB2zyyOFCx7YsKnLMSoMC
+gYBo8/gta1pKvw8efRaEVArJZD66KgTVK3nVPLlmepduOZFe5smnSCPagADRC6kH04hSOdoNNUwr
+/CIrTBoz/mQYyDzuQjU/wPLSVKhAJDcqTppgvi3CzHgWWTSecicohB7MtwoszlDWWWvrQCFg4SKH
+pqO8l/8RNHir6d4vGSpVwQKBgQCGDITqBStwmSLTJl0gqh93I913xHO1ptqdHs2VUnyphpM2/JGO
+h0t3SHjLCK2nM4QoyIaH6voO2Zrb3CciIc4yEYW12m0mb7oZv6wFpG82dwFKpWxk19merd702K1x
+Wu2LEggTuES/9NIPBO4Trsl1nKNrb0/gi2MY1optrJpwIwKBgFBgsmUTd13zPP1PB/F1h1y1jKFG
+D3UejPH0D4W8LO36VqDq76waXLJeL01QemhUKErvBVoB5UIQl1S2kZ/68CuoxaDtm04AcfSYLExK
+jCpuEtKPSOU7iO25wgymuuwGdMnjXWvQry7oRJam6v5WLw2DY8zlDxT1dLkww5H6VhXL
+-----END RSA PRIVATE KEY-----