Updated README and docs

Author: rajch

README.md

@@ -41,7 +41,7 @@ The easiest way is to pull the docker image, and run from that. The steps are as
   and then browse to that IP address using the port that you mapped in step 2. E.g.: `http://192.17.22.1:5000`
 
 ### Running with node.js
-Alternatively, if you have node.js installed on your docker host, you can clone the github repository, and run voxel-dockerclient yourself. The steps are:
+Alternatively, if you have node.js installed on your docker host, you can clone the github repository, and build and run voxel-dockerclient yourself. The steps are:
 
 1. Clone the github repository with
 
@@ -56,7 +56,8 @@ Alternatively, if you have node.js installed on your docker host, you can clone
 3. Run
 
   ```
-  npm start
+  npm run build-all
+  npm run run-docker
   ```
 4. Browse to `http://localhost:8080`
 
@@ -69,8 +70,8 @@ voxel-dockerclient has been tested using recent Chrome and Firefox browsers, on
 
 ## What's next?
 I intend to add the following capabilities quickly:
-* `docker logs` equivalent
-* `docker attach` equivalent
+* ~~`docker logs` equivalent~~ ** DONE
+* ~~`docker attach` equivalent~~ ** DONE
 * `docker pull` equivalent
 * A better interface for the `create` command
 * *Some* security
@@ -83,18 +84,19 @@ In the pipeline, further down, are:
 I don't really know how far I want to take this. I do want voxel-dockerclient to be complete, but I want to keep it simple. I may turn it into a teaching tool eventually.
 
 ## How does it work?
-On the server, voxel-dockerclient uses [Express](http://expressjs.com/) and the excellent [dockerode](https://github.com/apocas/dockerode) node module to provide a proxy for a subset of the Docker remote API.
+~~On the server, voxel-dockerclient uses [Express](http://expressjs.com/) and the excellent [dockerode](https://github.com/apocas/dockerode) node module to provide a proxy for a subset of the Docker remote API.~~
+The voxel-dockerclient server is simply nginx, proxying the docker daemon's UNIX socket. At the moment, it proxies the full API with no authorization. This will change.
 
 On the client, it uses the brilliant [voxeljs](http://voxeljs.com/) family of node modules to render the UI, and the [axios](https://github.com/mzabriskie/axios) node module to communicate with the proxied API.
 
-I am using an older flavour of the main voxeljs module, voxel-engine. I had to fork it because of some incompatibilities with later modules. The original is [here](https://github.com/maxogden/voxel-engine), and my forked version [here](https://github.com/rajch/voxel-engine).
+I have used an older flavour of the main voxeljs module, voxel-engine. I had to fork it because of some incompatibilities with later modules. The original is [here](https://github.com/maxogden/voxel-engine), and my forked version [here](https://github.com/rajch/voxel-engine).
 The same treatment had to be given for a voxeljs plugin called voxel-keys. The original is [here](https://github.com/voxel/voxel-keys), and my fork [here](https://github.com/rajch/voxel-keys).
 
 The code is open source, under the MIT license. I would love contribution, in the form of issue reporting, feature requests, pull requests, anything. 
 
 ## Acknowledgements
 I would like to thank:
-* The fine folk of Docker, for Docker
-* The fine folk behind the voxeljs family of modules. github/maxogden, github/kumavis, github/deathcap, github/substack et al. These are really nice.
-* The authors of the dockerode and axios modules
+* The fine folk of @docker, for Docker
+* The fine folk behind the voxeljs family of modules. @github/maxogden, @github/kumavis, @github/deathcap, @github/substack et al. These are really nice.
+* The authors of the dockerode and axios modules, although I'm not using dockerode any more.
 * My partner, Chitra Raghavan, for contributing the player model, testing, and bearing with me while I was building this

docs/index.md

@@ -25,6 +25,8 @@ Open the command console, and try the commands. Currently, the following command
 |top|Shows processes running in a container|
 |start|Starts a container|
 |stop|Stops a container|
+|logs|Shows a container's logs|
+|attach|Attaches a terminal to an interactive container|
 |go|Takes player to a container, or to the first or last container. Type go home if you get lost.|
 |remove|Deletes a container|
 |create|Creates a container|
@@ -43,3 +45,6 @@ Activity performed in other clients, such as the official docker client, will no
 
 The `go` command can be used to teleport the player to a particular container, using the syntax `go <containername>`. `go home` will teleport to the first (oldest) container. `go nextslot` will teleport to the spot where the next new container will appear. 
 
+The `logs` command shows a container's logs, if available.
+
+The `attach` command opens a terminal attached to the main process of a container. You can press Ctrl+L to refresh the terminal, and Ctrl+P, Ctrl+Q to detach the terminal.

package.json

@@ -7,9 +7,9 @@
     "test": "echo \"Error: no test specified\" && exit 1",
     "build-public": "copyfiles -f node_modules/xterm/dist/xterm.js public/js && copyfiles -f node_modules/xterm/dist/xterm.css public/css",
     "build-debug": "browserify --debug client/main.js -o public/js/client.js",
-    "build-docker": "docker build -t vdclient .",
-    "build-all": "npm run build-debug && npm run build-docker",
-    "run-docker": "docker run --rm --name vdc1 -h vdc1 -v /var/run/docker.sock:/var/run/docker.sock -p 8080:8080 vdclient"
+    "build-docker": "docker build -t voxel-dockerclient .",
+    "build-all": "npm run build-public && npm run build-debug && npm run build-docker",
+    "run-docker": "docker run --rm --name vdc1 -h vdc1 -v /var/run/docker.sock:/var/run/docker.sock -p 8080:8080 voxel-dockerclient"
   },
   "repository": {
     "type": "git",