Merge e2167f5 into a0255e6

README.md

@@ -6,8 +6,16 @@ bump other players and objects off to stay alive
 ## Getting Started
 Play the latest version [here](http://bumper.ubclaunchpad.com)!  
 
-## Development
-### Running the server
+## Docker Quickstart
+Install Docker and the Docker Compose toolset. Then run:
+```bash
+docker-compose -f docker-compose.dev.yml up
+```
+
+## Manual Quickstart
+Go and Node are required.  
+
+### Server
 [dep](https://github.com/golang/dep) is used for handling server dependencies.
 ```bash
 $ cd ./server
@@ -20,10 +28,10 @@ To add dependencies:
 $ dep ensure -add github.com/my/dependency
 ```
 
-### Running the client
+### Client
 ```bash
 $ cd ./client
 $ npm install
 $ npm start
 ```
-Play at localhost:8080!
+Play at localhost:8080!

client/webpack.config.js

@@ -1,6 +1,5 @@
 /* eslint-disable */
 const webpack = require('webpack');
-const MinifyPlugin = require('babel-minify-webpack-plugin');
 
 const config = {
   entry: './index.js',
@@ -26,8 +25,10 @@ const config = {
     ],
   },
   plugins: [
-    new webpack.EnvironmentPlugin(['NODE_ENV']),
+    new webpack.EnvironmentPlugin([
+      'NODE_ENV',
+    ]),
   ]
 };
 
-module.exports = env => config;
+module.exports = config;

client/webpack.prod.js

@@ -1,29 +1,7 @@
 /* eslint-disable */
-const webpack = require('webpack');
 const MinifyPlugin = require('babel-minify-webpack-plugin');
 
-const config = {
-  entry: './index.js',
-  output: {
-    path: `${__dirname}/public/`,
-    filename: 'bundle.js',
-  },
-  module: {
-    loaders: [
-      {
-        test: /\.jsx?$/,
-        exclude: '/node_modules/',
-        loader: 'babel-loader',
-        query: {
-          presets: ['es2015', 'react'],
-        },
-      },
-    ],
-  },
-  plugins: [
-    new webpack.EnvironmentPlugin(['NODE_ENV']),
-    new MinifyPlugin(),
-  ]
-};
+const config = require('./webpack.config');
+config.plugins.push(new MinifyPlugin);
 
-module.exports = env => config;
+module.exports = config;

docker-compose.dev.yml

@@ -0,0 +1,19 @@
+version: '3.4'
+
+services:
+  client:
+    build:
+      context: .
+      target: client
+    volumes:
+      - ./client:/app
+    command: npm start
+    ports:
+      - "8080:8080"
+  server:
+    build:
+      context: .
+      target: server
+    command: go run main.go
+    ports:
+      - "9090:9090"