From a72f9af984223e7f8fdb6e74cb0151b8dce4c403 Mon Sep 17 00:00:00 2001
From: Fabio Bas <ctrlaltca@gmail.com>
Date: Mon, 11 Apr 2016 18:51:44 +0200
Subject: [PATCH] Updated Dockerfile and doc

---
 .dockerignore |  1 -
 Dockerfile    | 11 ++++-------
 README.md     | 11 +++++++++--
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index c04711aa..65c13ebf 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -9,4 +9,3 @@ oracle/
 sounds/
 travis-compile.sh
 travis-dependencies.sh
-zonebg/
diff --git a/Dockerfile b/Dockerfile
index 581070cc..ad0352b0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,21 +3,18 @@ MAINTAINER Gavin Bisesi <Daenyth@gmail.com>
 
 RUN apt-get update && apt-get install -y software-properties-common
 RUN apt-add-repository ppa:ubuntu-sdk-team/ppa
+RUN add-apt-repository -y ppa:smspillaz/cmake-master
 RUN apt-get update && apt-get install -y\
+  build-essential g++\
   cmake\
   git\
   libprotobuf-dev\
-  libqt5sql5-mysql\
-  libqt5svg5-dev\
-  libqt5webkit5-dev\
-  libsqlite3-dev\
   protobuf-compiler\
   qt5-default\
   qtbase5-dev\
-  qtdeclarative5-dev\
-  qtmultimedia5-dev\
   qttools5-dev-tools\
-  qttools5-dev
+  qttools5-dev\
+  libqt5sql5-mysql
 
 ENV dir /home/servatrice/code
 WORKDIR $dir
diff --git a/README.md b/README.md
index 3088b496..b85f4718 100644
--- a/README.md
+++ b/README.md
@@ -93,8 +93,15 @@ The following flags can be passed to `cmake`:
 - `-DTEST=1` Enable regression tests (default 0 = no). Note: needs googletest, will be downloaded on the fly if unavailable. To run tests: ```make test```.
 
 
-#### Building servatrice Docker container
-`docker build -t servatrice .`<br>
+#### Servatrice Docker container
+
+A Dockerfile is provided to run Servatrice (the Cockatrice server) using [Docker](https://www.docker.com/what-docker).
+You just need to create an image from the Dockerfile
+`docker build -t servatrice .`
+And then run it
+`docker run -i -p 4747:4747/tcp -t servatrice:latest`
+Please note that running this command will expose the TCP port 4747 of the docker container to permit connections to the server.
+<br>
 
 
 # Running