Merge branch 'dev-beta' into dev-beta

Author: ehlewis

CONTRIBUTING.md

@@ -0,0 +1,2 @@
+If you would like to contribute to the development of AutoSploit please use the `dev-beta` branch from now on. 
+Once we get a working version up in that branch i will update the `master` branch accordingly.

Docker/README.md

@@ -2,6 +2,17 @@ Docker deployment instructions
 =====
 
 ## tl;dr
+
+Using [docker-compose](https://docs.docker.com/compose/install/):
+
+```bash
+git clone https://github.com/NullArray/AutoSploit.git
+cd Autosploit/Docker
+docker-compose run --rm autosploit
+```
+
+Using just Docker:
+
 ```bash
 git clone https://github.com/NullArray/AutoSploit.git
 cd Autosploit/Docker

Docker/docker-compose.yml

@@ -0,0 +1,30 @@
+version: '3'
+
+services:
+  autosploit:
+    build:
+      context: .
+    ports:
+      - 80:80
+      - 443:433
+      - 4444:4444
+    networks:
+      - haknet
+    depends_on:
+      - postgres
+  postgres:
+    image: postgres
+    environment:
+      - POSTGRES_PASSWORD=s3cr3t
+    networks:
+      - haknet
+    volumes:
+      - db:/var/lib/postgresql/data
+
+networks:
+  haknet:
+    driver: bridge
+
+volumes:
+  db:
+